merge from trunk
commitc635a4f3d114db265e574f106710f497b2a450b6
authorJoakim Verona <joakim@verona.se>
Mon, 26 Aug 2013 17:42:14 +0000 (26 19:42 +0200)
committerJoakim Verona <joakim@verona.se>
Mon, 26 Aug 2013 17:42:14 +0000 (26 19:42 +0200)
tree5689d824ba11b6846fc40e2f99ec3a53daa42ef2
parent789fc3346ed7f2e8a2c3ba09502bce59893f1167
parentf5adc984fbdc82def6edc297e88c3ee993c674ae
merge from trunk