Merge branch 'import'
authorWouter Verhelst <w@uter.be>
Sun, 24 May 2009 07:22:40 +0000 (09:22 +0200)
committerWouter Verhelst <w@uter.be>
Sun, 24 May 2009 07:22:40 +0000 (09:22 +0200)

Trivial merge