upstream merge
authorJoakim Verona <joakim@verona.se>
Thu, 19 Aug 2010 07:34:21 +0000 (09:34 +0200)
committerJoakim Verona <joakim@verona.se>
Thu, 19 Aug 2010 07:34:21 +0000 (09:34 +0200)

Trivial merge