merge from trunk
commita24dabe5ac4e7d051b9c1d6fc3bc17154ea0d042
authorJoakim Verona <joakim@verona.se>
Tue, 13 Aug 2013 02:30:54 +0000 (13 04:30 +0200)
committerJoakim Verona <joakim@verona.se>
Tue, 13 Aug 2013 02:30:54 +0000 (13 04:30 +0200)
treea7895c881938049c2812e62cce0afc27b4c56178
parent30e2a1217667de18501bba00899c43a6f410906b
parent5c41e9ffeaefbf8d01360c1fc911a324940573ee
merge from trunk