Author: Claes Nästén
Date: Thu Mar 18 11:51:08 +0100 2010
Subject: Merge: 128f2ed f5db00f