merge from trunk
commit6138b628138c110e647a5835440a3f183d1cab50
authorJoakim Verona <joakim@verona.se>
Thu, 12 Sep 2013 05:11:47 +0000 (12 07:11 +0200)
committerJoakim Verona <joakim@verona.se>
Thu, 12 Sep 2013 05:11:47 +0000 (12 07:11 +0200)
treedf1016a355237431d2f6235153bfdaffc15312c2
parent44074387d5a68511f0da1fbcf6a695d1f8c7f112
parentd3b049e6015c09a2d1ea101e5fb466c6ce9f61e0
merge from trunk