[MERGE] merge from trunk addons
authorMustufa Rangwala <mra@mra-laptop>
Mon, 27 Sep 2010 12:59:21 +0000 (18:29 +0530)
committerMustufa Rangwala <mra@mra-laptop>
Mon, 27 Sep 2010 12:59:21 +0000 (18:29 +0530)
commitd7159c5cd5fa84aaa9f801aba66efb712c97d44d
treebe2c9bed877ec6f1861e5223a169d2b1a0fa6e23
parent0e65bbb4707f7e1991e03f65d6c6aeae1bf19d35
parent449c4ae7bf4ecc3bdfb5193de03f6212e09f07d1
[MERGE] merge from trunk addons

bzr revid: mra@mra-laptop-20100927125921-urvuknouixjnxqix