[MERGE] Merge with dev-addons3 branch bzr revid: psi@tinyerp.co.in-20100624063605-6dknkiiqa19l0g3r
bzr revid: hda@tinyerp.com-20100205150927-ztj0oaw3d3mv4f34