[MERGE] merge from trunk addons
bzr revid: mra@mra-laptop-
20110317044632-q2idnbo10137sp20
bzr revid: mra@mra-laptop-
20110318090655-j34s9q5qu3iika49
bzr revid: mra@mra-laptop-
20110321091456-nn8ydasget5h400r
bzr revid: mra@mra-laptop-
20110322130110-e4q5os11b2aphfk6
bzr revid: mra@mra-laptop-
20110323043940-490q3q9lnwwvduy0
bzr revid: mra@mra-laptop-
20110328045527-rih3g38wcgonx05m
bzr revid: mra@mra-laptop-
20110329045144-vclevl8cvq05ga8c
bzr revid: mra@mra-laptop-
20110330044007-iiokjyv6ap6k94ak
bzr revid: mra@mra-laptop-
20110401043719-mtgl4wwz90mi5rac
bzr revid: mra@mra-laptop-
20110404044827-rqbqf6jdaf9o5unc