merge from trunk
commit71c3ecbadba97c8502afe8f5ab5b1b6edbf3f39a
authorJoakim Verona <joakim@verona.se>
Tue, 13 Aug 2013 02:45:50 +0000 (13 04:45 +0200)
committerJoakim Verona <joakim@verona.se>
Tue, 13 Aug 2013 02:45:50 +0000 (13 04:45 +0200)
tree79eb78545b68054115147e518f98c4b555ca2169
parenta24dabe5ac4e7d051b9c1d6fc3bc17154ea0d042
parent5514cc4c84969122668c89a387b858157e0c2e74
merge from trunk