Merge with master
authorJonas Fonseca <fonseca@diku.dk>
Tue, 16 May 2006 15:19:14 +0000 (17:19 +0200)
committerJonas Fonseca <fonseca@antimatter.localdomain>
Tue, 16 May 2006 15:19:14 +0000 (17:19 +0200)
commit24bd80d642da4c0cddc30e0ef05ab84e0f0bcf8a
treefe3d2aef68a0a44f1cc6d090054613adb3172622
parent2b9c2ad0cb752490823c2e0ac11a70547103cda3
parentb8ae93466d333ed4f0016842a7d6355f71e195fd
Merge with master