[MERGE] merge from trunk addons
authorMustufa Rangwala <mra@mra-laptop>
Tue, 28 Sep 2010 13:37:25 +0000 (19:07 +0530)
committerMustufa Rangwala <mra@mra-laptop>
Tue, 28 Sep 2010 13:37:25 +0000 (19:07 +0530)
commit3eb2cbe9b232b092b88a6e6fc3d1769c1f92201e
tree986e6bf71059ce635788599a76438a8ee99eb7b1
parent9fe138bd230f69377b4f13f9ddfbedca05537dd5
parent4d11c419bf1d936d71fcd8d0564e503c860f36e1
[MERGE] merge from trunk addons

bzr revid: mra@mra-laptop-20100928133725-7a7r1x5z63cxfs9g