merge
authorDag Sverre Seljebotn <dagss@student.matnat.uio.no>
Fri, 13 Feb 2009 18:05:33 +0000 (19:05 +0100)
committerDag Sverre Seljebotn <dagss@student.matnat.uio.no>
Fri, 13 Feb 2009 18:05:33 +0000 (19:05 +0100)

Trivial merge