[MERGE] merge from trunk addons
authorMustufa Rangwala <mra@mra-laptop>
Thu, 25 Nov 2010 03:48:22 +0000 (09:18 +0530)
committerMustufa Rangwala <mra@mra-laptop>
Thu, 25 Nov 2010 03:48:22 +0000 (09:18 +0530)
commitf4174a07a5f8425998b69363c928243cf1d1172b
tree991bdb749c1959530e1664f9872c4c2de821b165
parent8e49536ce929820085dfa7513e0f98daad7c3afb
parentccc031a3999cd05450ce057f89759141d309b3e9
[MERGE] merge from trunk addons

bzr revid: mra@mra-laptop-20101125034822-r21kr93zgkhu9gto