merge from trunk
commita218d7fbf59ed0896f02bf50ed1702c26696cd30
authorJoakim Verona <joakim@verona.se>
Tue, 13 Aug 2013 17:56:17 +0000 (13 19:56 +0200)
committerJoakim Verona <joakim@verona.se>
Tue, 13 Aug 2013 17:56:17 +0000 (13 19:56 +0200)
treeb2236d22cd75ef70c021faa6d4525b408f14c9ea
parentcf79cb9c1756f794b4f5c77b058d09e713f7b364
parent8259030d684cc11dcaf548a1aea29d7badf921fe
merge from trunk