more merge
authorDag Sverre Seljebotn <dagss@student.matnat.uio.no>
Wed, 2 Jul 2008 11:16:50 +0000 (13:16 +0200)
committerDag Sverre Seljebotn <dagss@student.matnat.uio.no>
Wed, 2 Jul 2008 11:16:50 +0000 (13:16 +0200)

Trivial merge