[MERGE] merge with trunk addons
authorMustufa Rangwala <mra@mra-laptop>
Wed, 30 Jun 2010 12:21:22 +0000 (17:51 +0530)
committerMustufa Rangwala <mra@mra-laptop>
Wed, 30 Jun 2010 12:21:22 +0000 (17:51 +0530)
bzr revid: mra@mra-laptop-20100630111118-dw01xhu17k2i0n7x
bzr revid: mra@mra-laptop-20100630114208-4wz4g5hv61fqsy9f
bzr revid: mra@mra-laptop-20100630122122-30k9ubhfezja0ufm


Trivial merge