merge from trunk
commit789fc3346ed7f2e8a2c3ba09502bce59893f1167
authorJoakim Verona <joakim@verona.se>
Mon, 26 Aug 2013 16:42:27 +0000 (26 18:42 +0200)
committerJoakim Verona <joakim@verona.se>
Mon, 26 Aug 2013 16:42:27 +0000 (26 18:42 +0200)
tree2118ffbdec816f340efa40ae88eb8c69577c7095
parentffb49902dad1e9f8ae8083732c395e4103ba0561
parent447218dd746e66544176995f1c791609b632a398
merge from trunk