merge
authorDag Sverre Seljebotn <dagss@student.matnat.uio.no>
Mon, 14 Jul 2008 13:55:33 +0000 (15:55 +0200)
committerDag Sverre Seljebotn <dagss@student.matnat.uio.no>
Mon, 14 Jul 2008 13:55:33 +0000 (15:55 +0200)

Trivial merge