Merge branches
authorMichael Prokop <devnull@localhost>
Mon, 26 Nov 2007 18:55:44 +0000 (19:55 +0100)
committerMichael Prokop <devnull@localhost>
Mon, 26 Nov 2007 18:55:44 +0000 (19:55 +0100)

Trivial merge