Merge branch 'docs'
authorDag Sverre Seljebotn <dagss@student.matnat.uio.no>
Sat, 2 Apr 2011 15:37:43 +0000 (17:37 +0200)
committerDag Sverre Seljebotn <dagss@student.matnat.uio.no>
Sat, 2 Apr 2011 15:37:43 +0000 (17:37 +0200)

Trivial merge