Merge with master
authorJonas Fonseca <fonseca@diku.dk>
Wed, 14 Jun 2006 20:28:24 +0000 (22:28 +0200)
committerJonas Fonseca <fonseca@antimatter.localdomain>
Wed, 14 Jun 2006 20:28:24 +0000 (22:28 +0200)

Trivial merge