[MERGE] merge from trunk addons
authorMustufa Rangwala <mra@mra-laptop>
Wed, 22 Sep 2010 10:25:55 +0000 (15:55 +0530)
committerMustufa Rangwala <mra@mra-laptop>
Wed, 22 Sep 2010 10:25:55 +0000 (15:55 +0530)
commitbb5e34f28a2005b8810dda1e38a2213c91dc5e13
tree28dfff069481a78a312c39b63848bd50700bc396
parent1538f3dcb7d53cc615ad3a1e00d9be3747bdf7a8
parent0781486e2f95ee953356431b1607ef24d89bccb6
[MERGE] merge from trunk addons

bzr revid: mra@mra-laptop-20100922102555-kszji33a4ng880xb