merge from trunk
commit8e6a3959ba772997f80108b53317e966f63cf52d
authorJoakim Verona <joakim@verona.se>
Thu, 15 Aug 2013 20:01:31 +0000 (15 22:01 +0200)
committerJoakim Verona <joakim@verona.se>
Thu, 15 Aug 2013 20:01:31 +0000 (15 22:01 +0200)
treecb18ef9bab074d3bb78c5a14e4eb49407c134544
parent575dd3ba75231b7df64b3f2b88ef88909417cf38
parent7967001450f4a3e76e37355740fa942290cede26
merge from trunk