[MERGE] merge from trunk addons
authorMustufa Rangwala <mra@mra-laptop>
Mon, 27 Sep 2010 10:52:15 +0000 (16:22 +0530)
committerMustufa Rangwala <mra@mra-laptop>
Mon, 27 Sep 2010 10:52:15 +0000 (16:22 +0530)
bzr revid: mra@mra-laptop-20100927105215-fw9niblj8hr7vg7h


Trivial merge