merge from trunk
commite4ccda9e0071fab547036a2c1c6e7ff7a5db3286
authorJoakim Verona <joakim@verona.se>
Fri, 13 Sep 2013 08:41:15 +0000 (13 10:41 +0200)
committerJoakim Verona <joakim@verona.se>
Fri, 13 Sep 2013 08:41:15 +0000 (13 10:41 +0200)
tree1aec8765233aeba9bbd1120038a6deb29c476d54
parent4db1f22b64c3d19c963b67d9299dc508c440c625
parent3509fb4083986c2d2d4b98f114abbf0a11564105
merge from trunk