Merge branch 'master' into nigiri
authorWolfram Schneider <wosch@indexdata.dk>
Tue, 6 Apr 2010 15:25:54 +0000 (15:25 +0000)
committerWolfram Schneider <wosch@indexdata.dk>
Tue, 6 Apr 2010 15:25:54 +0000 (15:25 +0000)

Trivial merge