Merge with master
authorJonas Fonseca <fonseca@diku.dk>
Wed, 14 Jun 2006 23:28:15 +0000 (01:28 +0200)
committerJonas Fonseca <fonseca@antimatter.localdomain>
Wed, 14 Jun 2006 23:28:15 +0000 (01:28 +0200)
commit0c1745a4c8711bb021921e8446113e366901fc37
treeff1eb5257fa84ece6ebdfd859981f37bb848072f
parentc3a4b3e0104b32beb965e913543affef86b583be
parent604da3b78777bf69d01d214f203f3be8ee258f67
Merge with master