merge
authorDag Sverre Seljebotn <dagss@student.matnat.uio.no>
Sat, 20 Feb 2010 12:36:43 +0000 (13:36 +0100)
committerDag Sverre Seljebotn <dagss@student.matnat.uio.no>
Sat, 20 Feb 2010 12:36:43 +0000 (13:36 +0100)

Trivial merge