Merge with master
authorJonas Fonseca <fonseca@diku.dk>
Sun, 3 Sep 2006 20:04:25 +0000 (22:04 +0200)
committerJonas Fonseca <fonseca@antimatter.localdomain>
Sun, 3 Sep 2006 20:04:25 +0000 (22:04 +0200)

Trivial merge