[MERGE] Merge with trunk addons
authorMustufa Rangwala <mra@mra-laptop>
Tue, 14 Sep 2010 11:03:47 +0000 (16:33 +0530)
committerMustufa Rangwala <mra@mra-laptop>
Tue, 14 Sep 2010 11:03:47 +0000 (16:33 +0530)
bzr revid: mra@mra-laptop-20100914110347-x6imj2f3bd79djwf


Trivial merge