[MERGE] merge with trunk addons
authorMustufa Rangwala <mra@mra-laptop>
Tue, 6 Jul 2010 08:46:01 +0000 (14:16 +0530)
committerMustufa Rangwala <mra@mra-laptop>
Tue, 6 Jul 2010 08:46:01 +0000 (14:16 +0530)
commit41f2357e61a02be873c0d46e06cc958ccd796a01
treead29f2ee40d48e123c0dad8ee5ebe47679ad5168
parent77f8624f204a404e575de46c260c54f7391cdd58
parent177bd4c707a49a2f430a56f9b686229196075111
[MERGE] merge with trunk addons

bzr revid: mra@mra-laptop-20100703120259-fa0dhq8qwjmmvd8l
bzr revid: mra@mra-laptop-20100706035350-ypi0nc27m6r2bftg
bzr revid: mra@mra-laptop-20100706084601-cyyo92iyngs2nksr