merge from trunk
commit41c0d73a318ece49776f1131a99e71253f953689
authorJoakim Verona <joakim@verona.se>
Wed, 11 Sep 2013 16:12:24 +0000 (11 18:12 +0200)
committerJoakim Verona <joakim@verona.se>
Wed, 11 Sep 2013 16:12:24 +0000 (11 18:12 +0200)
tree5b839899dca4bfce8bbbe2e42b62e0341fbd8cb9
parente9d8fea04e2d22ba8c6b238444f04d654492fa76
parent8d2db8be5bccf0d772e0690e612a1f499be4cb48
merge from trunk