merge
authorDag Sverre Seljebotn <dagss@student.matnat.uio.no>
Thu, 15 Oct 2009 11:36:27 +0000 (13:36 +0200)
committerDag Sverre Seljebotn <dagss@student.matnat.uio.no>
Thu, 15 Oct 2009 11:36:27 +0000 (13:36 +0200)

Trivial merge