merge
authorDag Sverre Seljebotn <dagss@student.matnat.uio.no>
Wed, 28 Oct 2009 15:26:04 +0000 (16:26 +0100)
committerDag Sverre Seljebotn <dagss@student.matnat.uio.no>
Wed, 28 Oct 2009 15:26:04 +0000 (16:26 +0100)

Trivial merge