merge
authorDag Sverre Seljebotn <dagss@student.matnat.uio.no>
Sun, 30 Nov 2008 10:42:40 +0000 (11:42 +0100)
committerDag Sverre Seljebotn <dagss@student.matnat.uio.no>
Sun, 30 Nov 2008 10:42:40 +0000 (11:42 +0100)

Trivial merge