merge
authorDag Sverre Seljebotn <dagss@student.matnat.uio.no>
Sat, 21 Feb 2009 17:22:10 +0000 (18:22 +0100)
committerDag Sverre Seljebotn <dagss@student.matnat.uio.no>
Sat, 21 Feb 2009 17:22:10 +0000 (18:22 +0100)

Trivial merge