Merge branches 0.0.9
authorMichael Prokop <devnull@localhost>
Sun, 18 Nov 2007 21:23:45 +0000 (22:23 +0100)
committerMichael Prokop <devnull@localhost>
Sun, 18 Nov 2007 21:23:45 +0000 (22:23 +0100)

Trivial merge