merge from trunk
commit369c41754f0090065eb226e879f5c30a2a711132
authorJoakim Verona <joakim@verona.se>
Tue, 27 Aug 2013 07:12:22 +0000 (27 09:12 +0200)
committerJoakim Verona <joakim@verona.se>
Tue, 27 Aug 2013 07:12:22 +0000 (27 09:12 +0200)
treed5c6537d50c9ccd26fcfb1912d1e77bfe7e84448
parentd5ac6cccbe97aabd7b8d324aaae3716eb9853cb1
parent61ac6b9f821504ce12e0797a1fcf403e951d193b
merge from trunk