Code

Merge branch 'upstream/1.3' into experimental
authorSebastian Harl <sh@tokkee.org>
Sun, 18 May 2008 17:41:10 +0000 (19:41 +0200)
committerSebastian Harl <sh@tokkee.org>
Sun, 18 May 2008 17:41:10 +0000 (19:41 +0200)

Trivial merge