[MERGE] merge with trunk addons
authorMustufa Rangwala <mra@mra-laptop>
Fri, 2 Jul 2010 04:16:43 +0000 (09:46 +0530)
committerMustufa Rangwala <mra@mra-laptop>
Fri, 2 Jul 2010 04:16:43 +0000 (09:46 +0530)
commit92fe56a8279fd7ef2e53c1b2a156a584011338ec
tree387a46951a100e0bcf7c96b2c830e33682ad7fd2
parentf0fa7346eca2165af0a4af5740cf2360405e7a2a
parent6f15b8f1d709543c656c27d3ec2616c0cadb76d8
[MERGE] merge with trunk addons

bzr revid: mra@mra-laptop-20100702041643-xhkyoehh1gteqtn2