Merge with master
authorJonas Fonseca <fonseca@diku.dk>
Sun, 21 May 2006 03:05:15 +0000 (05:05 +0200)
committerJonas Fonseca <fonseca@antimatter.localdomain>
Sun, 21 May 2006 03:05:15 +0000 (05:05 +0200)

Trivial merge