From 6211ef54ab371459ad5d9254d081f180d8c0e32e Mon Sep 17 00:00:00 2001
From: einarr <einarr@pvv.ntnu.no>
Date: Tue, 17 Jul 2012 11:16:29 +0000
Subject: [PATCH] Main development branch.