Code

Merge branch 'upstream' into experimental
authorSebastian Harl <sh@tokkee.org>
Sat, 20 Dec 2008 12:40:16 +0000 (13:40 +0100)
committerSebastian Harl <sh@tokkee.org>
Sat, 20 Dec 2008 12:40:16 +0000 (13:40 +0100)

Trivial merge