merge from trunk
commit696296a32ecd33da891a15ae56db6208fee5b027
authorJoakim Verona <joakim@verona.se>
Wed, 21 Aug 2013 18:37:17 +0000 (21 20:37 +0200)
committerJoakim Verona <joakim@verona.se>
Wed, 21 Aug 2013 18:37:17 +0000 (21 20:37 +0200)
tree3362959c3d5c3c942c76a6aaf218c529ecc4928e
parent9c5dc5b6703306afe6970bf2d7553d085ceaa3f2
parent9f7b19259de7c93d3c132f359901c608a3f2e2b2
merge from trunk