I hate failed merges
authorWolfram Schneider <wosch@indexdata.dk>
Wed, 25 Mar 2009 09:52:02 +0000 (09:52 +0000)
committerWolfram Schneider <wosch@indexdata.dk>
Wed, 25 Mar 2009 09:52:02 +0000 (09:52 +0000)

Trivial merge