Code

Merge branch 'upstream-1.3' into experimental
authorSebastian Harl <sh@tokkee.org>
Wed, 23 Jul 2008 19:42:13 +0000 (21:42 +0200)
committerSebastian Harl <sh@tokkee.org>
Wed, 23 Jul 2008 19:42:13 +0000 (21:42 +0200)

Trivial merge