Merge branch 'bug/3118-align'
authorDag Sverre Seljebotn <dagss@student.matnat.uio.no>
Sat, 16 Apr 2011 16:17:57 +0000 (18:17 +0200)
committerDag Sverre Seljebotn <dagss@student.matnat.uio.no>
Sat, 16 Apr 2011 16:17:57 +0000 (18:17 +0200)

Trivial merge