Merge branch 'dev'
authorMikal Kolbein Gule <m.k.gule@usit.uio.no>
Tue, 3 Jul 2012 09:42:05 +0000 (11:42 +0200)
committerMikal Kolbein Gule <m.k.gule@usit.uio.no>
Tue, 3 Jul 2012 09:42:05 +0000 (11:42 +0200)

Trivial merge