merge from trunk
commitd400d0f25c3c9df2e9c1d26432b144779c81a684
authorJoakim Verona <joakim@verona.se>
Thu, 12 Sep 2013 06:47:03 +0000 (12 08:47 +0200)
committerJoakim Verona <joakim@verona.se>
Thu, 12 Sep 2013 06:47:03 +0000 (12 08:47 +0200)
tree813a1941cdee1a6900f015e265fe99cd10627e47
parenta87e9c8f9fb3c2696bed6c1f8edb7542461d673c
parent44915370e8c39adf7c9d65c29241269c454964aa
merge from trunk