merge from trunk
commitb657a571a916b158914f2a1e8bd8a5f1e7fa2872
authorJoakim Verona <joakim@verona.se>
Tue, 20 Aug 2013 15:03:30 +0000 (20 17:03 +0200)
committerJoakim Verona <joakim@verona.se>
Tue, 20 Aug 2013 15:03:30 +0000 (20 17:03 +0200)
tree380f24bf59176fba8b033ad7d2d3df526d1ee339
parentdd9b511aa5fc7194cec86398548f9e2afa0e435e
parent3f246b657225c786c460b22d774ab0b2e7488b55
merge from trunk