merge from trunk
commit8fe38b48844fa20976d28f4d21f03796c06c6ce4
authorJoakim Verona <joakim@verona.se>
Fri, 16 Aug 2013 13:02:42 +0000 (16 15:02 +0200)
committerJoakim Verona <joakim@verona.se>
Fri, 16 Aug 2013 13:02:42 +0000 (16 15:02 +0200)
treebd1996b5bf0c26706c7bbe5a9722af22e57f50ff
parent4b1afd6ad231b5ba95436632d94f0bc81eacab27
parent13c366c974f64168ffbffd751fe8c6fb946f3a69
merge from trunk