commit 6211ef54ab371459ad5d9254d081f180d8c0e32e
Author: einarr <einarr@pvv.ntnu.no>
Date:   Tue Jul 17 11:16:29 2012 +0000

    Main development branch.