merge
authorDag Sverre Seljebotn <dagss@student.matnat.uio.no>
Thu, 23 Apr 2009 19:21:09 +0000 (21:21 +0200)
committerDag Sverre Seljebotn <dagss@student.matnat.uio.no>
Thu, 23 Apr 2009 19:21:09 +0000 (21:21 +0200)

Trivial merge