Merge with master
authorJonas Fonseca <fonseca@diku.dk>
Wed, 14 Jun 2006 21:28:35 +0000 (23:28 +0200)
committerJonas Fonseca <fonseca@antimatter.localdomain>
Wed, 14 Jun 2006 21:28:35 +0000 (23:28 +0200)
commit6650347d7629076210c4736f744be98664b09047
tree65c08272ec9ee95e210063a1a424dd4ded04dff8
parentb484cbc84ae8fc3d2241e56c0048de9d99d650b8
parentf8a36a6b36fc62d41cca33659f85b7737311e592
Merge with master