merge
authorDag Sverre Seljebotn <dagss@student.matnat.uio.no>
Thu, 21 Aug 2008 13:22:57 +0000 (15:22 +0200)
committerDag Sverre Seljebotn <dagss@student.matnat.uio.no>
Thu, 21 Aug 2008 13:22:57 +0000 (15:22 +0200)

Trivial merge