merge
authorDag Sverre Seljebotn <dagss@student.matnat.uio.no>
Fri, 16 Oct 2009 10:19:07 +0000 (12:19 +0200)
committerDag Sverre Seljebotn <dagss@student.matnat.uio.no>
Fri, 16 Oct 2009 10:19:07 +0000 (12:19 +0200)

Trivial merge