merge from trunk
commit0b086327ccb086dadf737286ffd54d5418e181c4
authorJoakim Verona <joakim@verona.se>
Wed, 11 Sep 2013 12:42:07 +0000 (11 14:42 +0200)
committerJoakim Verona <joakim@verona.se>
Wed, 11 Sep 2013 12:42:07 +0000 (11 14:42 +0200)
tree2d16a9521fc5b00ca2eedfa8870ba80944ac34cb
parent41390a42c5c18af8a112d7481875fe25e42b659c
parentfeeff482d80b9f37d083497b2d3a9fec8bc58757
merge from trunk