[MERGE] merge from trunk addons
authorMustufa Rangwala <mra@mra-laptop>
Wed, 29 Sep 2010 04:28:18 +0000 (09:58 +0530)
committerMustufa Rangwala <mra@mra-laptop>
Wed, 29 Sep 2010 04:28:18 +0000 (09:58 +0530)
commit386ea256d6117b191bdce7316d41c183c769d11c
treefb0b9b26d9af0dbdfa967e8ef85d283d7149ea84
parent9b6f902de537c49190e5d4ccbeb5e0aab32fa7f2
parent3e967f78ff4f652f28929e3a7b97407924884dec
[MERGE] merge from trunk addons

bzr revid: mra@mra-laptop-20100929042818-26m2e5todwdnsj6d