Merge with master
authorJonas Fonseca <fonseca@diku.dk>
Wed, 17 May 2006 10:32:25 +0000 (12:32 +0200)
committerJonas Fonseca <fonseca@antimatter.localdomain>
Wed, 17 May 2006 10:32:25 +0000 (12:32 +0200)

Trivial merge