merge from trunk
commit6d2a4fc753d8533b4124fe59432bf4991c1db6b7
authorJoakim Verona <joakim@verona.se>
Fri, 16 Aug 2013 03:31:20 +0000 (16 05:31 +0200)
committerJoakim Verona <joakim@verona.se>
Fri, 16 Aug 2013 03:31:20 +0000 (16 05:31 +0200)
treef23d2fc2ea99ebc13acda7efcc5588382927bb45
parent9e72ced38d4303cf7b946ae990672e7d84bbd480
parentc8068af56770f8b0be93218e76dd17ea508f3365
merge from trunk