Code

Merge branch 'upstream'
authorSebastian Harl <sh@tokkee.org>
Wed, 24 Mar 2010 07:14:36 +0000 (08:14 +0100)
committerSebastian Harl <sh@tokkee.org>
Wed, 24 Mar 2010 07:14:36 +0000 (08:14 +0100)

Trivial merge