[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)
commitab84b0a9ef79c706c9129d5ec8e37eb609bebcef
treee0dfa1d0aa6b82d7a24d222af821acb73566ae58
parent5436d87aaf6841987d8be2779220a3eb7ec6ca8f
parent853388377ff397535c638432273cb1dc91f4a370
[MERGE] merge with trunk addons

bzr revid: mra@mra-laptop-20100630111118-dw01xhu17k2i0n7x
bzr revid: mra@mra-laptop-20100630114208-4wz4g5hv61fqsy9f
bzr revid: mra@mra-laptop-20100630122122-30k9ubhfezja0ufm