[MERGE] merge from trunk addons
authorMustufa Rangwala <mra@mra-laptop>
Thu, 9 Dec 2010 04:09:22 +0000 (09:39 +0530)
committerMustufa Rangwala <mra@mra-laptop>
Thu, 9 Dec 2010 04:09:22 +0000 (09:39 +0530)
bzr revid: mra@mra-laptop-20101209040922-wif5k5mosyb0289q


Trivial merge