commit f464592acf72e090d77e50a3475e7907109dfb37 Merge: 9f43412 35b73e5 Author: Mattias Ellert <mattias.ellert at fysast.uu.se> Date: Mon Oct 4 15:34:23 2010 +0200 Merge remote branch 'origin/f13/master' ---