[MERGE] merge with latest trunk

bzr revid: vja@tinyerp.com-20130429093627-cpxq3uybwsssrqr5
bzr revid: vja@tinyerp.com-20130430115558-p1aw1zszcur21fj5
bzr revid: vja@tinyerp.com-20130517054712-9o7u266nfm8atgjv
bzr revid: amb@tinyerp.com-20130529122717-lpk7tn30qek2i5yt