From 2bc0c6bee0ad6a736f731a6b1b9bcfa7d22092c3 Mon Sep 17 00:00:00 2001
From: Thomas Adamcik <adamcik@samfundet.no>
Date: Mon, 25 Oct 2010 21:16:00 +0200
Subject: [PATCH] Merge branch 'develop', remote branch 'jodal/develop' into
 develop