[MERGE] merge from trunk addons
authorMustufa Rangwala <mra@mra-laptop>
Tue, 23 Nov 2010 04:17:05 +0000 (09:47 +0530)
committerMustufa Rangwala <mra@mra-laptop>
Tue, 23 Nov 2010 04:17:05 +0000 (09:47 +0530)
commit57a9732d252276fb9678b0cbacc2d342d831608d
treecf2a08c02cb0713cdc48e03cd8297e67af9ccb92
parent170bb2a5a496d875e5b61679ac6eb696d6a48853
parent02533c117ab467c782c4426966d14733abb9ebd8
[MERGE] merge from trunk addons

bzr revid: mra@mra-laptop-20101122125535-suhnynlpgnuaq3du
bzr revid: mra@mra-laptop-20101123041705-cu0j7x136mdum5tf