commit 8b1e7dd49f9dce7b29338049e2e7f657d2b65caa Merge: f09dba4 5050e16 Author: Mattias Ellert <mattias.ellert at fysast.uu.se> Date: Wed Sep 1 10:21:12 2010 +0200 Merge remote branch 'origin/f12/master' ---