Merge upstream.
authorMichael Elsdörfer <michael@elsdoerfer.info>
Thu, 14 Jan 2010 18:27:22 +0000 (19:27 +0100)
committerMichael Elsdörfer <michael@elsdoerfer.info>
Thu, 14 Jan 2010 18:27:22 +0000 (19:27 +0100)

Trivial merge