merge upstream
commit6752d22f823d01391254b4f10e854f6456d26ed2
authorJoakim Verona <joakim@verona.se>
Sat, 30 Jul 2011 20:39:55 +0000 (30 22:39 +0200)
committerJoakim Verona <joakim@verona.se>
Sat, 30 Jul 2011 20:39:55 +0000 (30 22:39 +0200)
tree86901a8f43cd48f437e11be0e0ee61f656f6969a
parentc8937ab98654b9161bd7d79ff98a76bd0d3a984d
parent4464a33d9ca54af36ae7a3670273f1445a96425b
merge upstream