merge
authorDag Sverre Seljebotn <dagss@student.matnat.uio.no>
Fri, 12 Mar 2010 11:48:26 +0000 (12:48 +0100)
committerDag Sverre Seljebotn <dagss@student.matnat.uio.no>
Fri, 12 Mar 2010 11:48:26 +0000 (12:48 +0100)

Trivial merge