Code

Merge branch 'upstream-1.4' into experimental
authorSebastian Harl <sh@tokkee.org>
Mon, 5 Oct 2009 20:41:06 +0000 (22:41 +0200)
committerSebastian Harl <sh@tokkee.org>
Mon, 5 Oct 2009 20:41:06 +0000 (22:41 +0200)

Trivial merge