merge from stable
authorDag Sverre Seljebotn <dagss@student.matnat.uio.no>
Fri, 29 Aug 2008 21:05:25 +0000 (23:05 +0200)
committerDag Sverre Seljebotn <dagss@student.matnat.uio.no>
Fri, 29 Aug 2008 21:05:25 +0000 (23:05 +0200)

Trivial merge