merge from trunk
commit7cb9e4b1d146064cee0fd9ebaddf094a05819670
authorJoakim Verona <joakim@verona.se>
Thu, 12 Sep 2013 06:57:21 +0000 (12 08:57 +0200)
committerJoakim Verona <joakim@verona.se>
Thu, 12 Sep 2013 06:57:21 +0000 (12 08:57 +0200)
tree6bb933bacb5087f81ef8495b801100c2cc201d6f
parentd400d0f25c3c9df2e9c1d26432b144779c81a684
parentaa30fa6f3a4273adcfa1cba183a74a5aeb47b463
merge from trunk