merge from trunk
commit207a6ffd668f371fb2deb948e21f28d39d698596
authorJoakim Verona <joakim@verona.se>
Thu, 12 Sep 2013 14:37:18 +0000 (12 16:37 +0200)
committerJoakim Verona <joakim@verona.se>
Thu, 12 Sep 2013 14:37:18 +0000 (12 16:37 +0200)
tree52a6b07795890fd2a4eee6efba4d436e22f3d792
parent9e85e5849326ef68f54e7d21abc2bf898c158a37
parent4dfa4b9bd944fa385b248b5b0b56e95979119420
merge from trunk