[MERGE] merge with trunk addons
authorMustufa Rangwala <mra@mra-laptop>
Wed, 30 Jun 2010 03:54:50 +0000 (09:24 +0530)
committerMustufa Rangwala <mra@mra-laptop>
Wed, 30 Jun 2010 03:54:50 +0000 (09:24 +0530)
commit0bc4e09ec82acad9cf2aad1accafea8f05503641
treec0014c24db5eae4ebbc40609148c3f3b9b2866c4
parentc622a78fb5b4bd1a7273faeb630d81ad4198eb18
parent5094a430690b054aebc1e6016eb6f85314bd8d1a
[MERGE] merge with trunk addons

bzr revid: mra@mra-laptop-20100630035450-i1te250tnvoczgjj