commit 5391256f1853880413a1616e9af24683be29d1b5 Merge: 5500a95 57e8d4e Author: Mattias Ellert <mattias.ellert at fysast.uu.se> Date: Thu Sep 2 09:34:53 2010 +0200 Merge remote branch 'origin/f12/master' ---