merge from trunk
commit40d74a503910168002cb1e170494d2f6d1adfeba
authorJoakim Verona <joakim@verona.se>
Mon, 26 Aug 2013 07:12:15 +0000 (26 09:12 +0200)
committerJoakim Verona <joakim@verona.se>
Mon, 26 Aug 2013 07:12:15 +0000 (26 09:12 +0200)
tree5addd49b19c50441272fe82c3c357781d9928a70
parentefe162a9b43555097d85becb636acab6184b20bc
parentdf54bcbde0e7f8762b97a0e9ea2021e1902851e6
merge from trunk