commit 887af4b8cb8a8fe1b5a110a6c3d9b9ecdfad85fd Merge: f464592 9217e0e Author: Mattias Ellert <mattias.ellert at fysast.uu.se> Date: Mon Oct 4 15:35:23 2010 +0200 Merge remote branch 'origin/f12/master' ---