merge
authorDag Sverre Seljebotn <dagss@student.matnat.uio.no>
Tue, 3 Feb 2009 14:58:15 +0000 (15:58 +0100)
committerDag Sverre Seljebotn <dagss@student.matnat.uio.no>
Tue, 3 Feb 2009 14:58:15 +0000 (15:58 +0100)

Trivial merge