merge from trunk
commit95a60dc06b2d05485a702e62ee00834a71753922
authorJoakim Verona <joakim@verona.se>
Fri, 23 Aug 2013 10:31:49 +0000 (23 12:31 +0200)
committerJoakim Verona <joakim@verona.se>
Fri, 23 Aug 2013 10:31:49 +0000 (23 12:31 +0200)
tree130d652a834a5772df2b9735600d19fc654c1b3d
parent46ed8fdec3e2cf1f1dbb583a6ff22e27f6941ee4
parent1df7c7caf535a06ad2f3b18b5d46b987f2fa366d
merge from trunk