merge from trunk
commitd5ac6cccbe97aabd7b8d324aaae3716eb9853cb1
authorJoakim Verona <joakim@verona.se>
Tue, 27 Aug 2013 04:36:29 +0000 (27 06:36 +0200)
committerJoakim Verona <joakim@verona.se>
Tue, 27 Aug 2013 04:36:29 +0000 (27 06:36 +0200)
treee64deeb8c1e7001cab68753aa3bf0358c6340748
parent9d1c69140689c3efe53e50b01fe5d7f1d020277e
parentd350e350eaf4872d123e0ab873c4a095099013c9
merge from trunk