merge
authorDag Sverre Seljebotn <dagss@student.matnat.uio.no>
Thu, 15 Oct 2009 10:56:57 +0000 (12:56 +0200)
committerDag Sverre Seljebotn <dagss@student.matnat.uio.no>
Thu, 15 Oct 2009 10:56:57 +0000 (12:56 +0200)

Trivial merge