Code

Merge branch 'upstream'
authorAlexander Wirt <formorer@formorer.de>
Mon, 18 Feb 2008 23:19:55 +0000 (00:19 +0100)
committerAlexander Wirt <formorer@lisa.springfield.lan>
Mon, 18 Feb 2008 23:19:55 +0000 (00:19 +0100)

Trivial merge