Code

Merge branch 'upstream-1.4' into experimental
authorSebastian Harl <sh@tokkee.org>
Sun, 4 Oct 2009 13:26:19 +0000 (15:26 +0200)
committerSebastian Harl <sh@tokkee.org>
Sun, 4 Oct 2009 13:26:19 +0000 (15:26 +0200)

Trivial merge