merge upstream
commit7cb3d5841d40398d814afbfae6a9bcdcb268d997
authorJoakim Verona <joakim@verona.se>
Mon, 1 Aug 2011 09:57:52 +0000 (1 11:57 +0200)
committerJoakim Verona <joakim@verona.se>
Mon, 1 Aug 2011 09:57:52 +0000 (1 11:57 +0200)
tree62518ce1cd8557a8a90503e69eb4c31a8c7a2348
parenteac24b5200ba6fba56aa73b3cc9a8d7c8aa870bb
parentf79fbbc795f85969a7fc84f1e46ec8162c04b91b
merge upstream