merge
authorDag Sverre Seljebotn <dagss@student.matnat.uio.no>
Tue, 27 Oct 2009 19:18:19 +0000 (20:18 +0100)
committerDag Sverre Seljebotn <dagss@student.matnat.uio.no>
Tue, 27 Oct 2009 19:18:19 +0000 (20:18 +0100)

Trivial merge