Code

Merge branch 'upstream-1.3' into experimental
authorSebastian Harl <sh@tokkee.org>
Fri, 30 May 2008 15:33:47 +0000 (17:33 +0200)
committerSebastian Harl <sh@tokkee.org>
Fri, 30 May 2008 15:33:47 +0000 (17:33 +0200)

Trivial merge