merge
authorDag Sverre Seljebotn <dagss@student.matnat.uio.no>
Tue, 19 May 2009 16:57:59 +0000 (18:57 +0200)
committerDag Sverre Seljebotn <dagss@student.matnat.uio.no>
Tue, 19 May 2009 16:57:59 +0000 (18:57 +0200)

Trivial merge