merge
authorDag Sverre Seljebotn <dagss@student.matnat.uio.no>
Fri, 14 Nov 2008 00:16:04 +0000 (01:16 +0100)
committerDag Sverre Seljebotn <dagss@student.matnat.uio.no>
Fri, 14 Nov 2008 00:16:04 +0000 (01:16 +0100)

Trivial merge