merge from trunk
commit9c5dc5b6703306afe6970bf2d7553d085ceaa3f2
authorJoakim Verona <joakim@verona.se>
Wed, 21 Aug 2013 10:31:36 +0000 (21 12:31 +0200)
committerJoakim Verona <joakim@verona.se>
Wed, 21 Aug 2013 10:31:36 +0000 (21 12:31 +0200)
treee85699763b5074cf9fc9717cb5160dc8eae18d3c
parentc9cfa8679176a2b74722f242a7a3c1fbd19d5097
parentdf391f9b3f2079091c180b6a18f4c8855f202e3b
merge from trunk