merge
authorDag Sverre Seljebotn <dagss@student.matnat.uio.no>
Thu, 27 Nov 2008 11:03:24 +0000 (12:03 +0100)
committerDag Sverre Seljebotn <dagss@student.matnat.uio.no>
Thu, 27 Nov 2008 11:03:24 +0000 (12:03 +0100)

Trivial merge