commit 9e0348e1b569e67cd23241362ec4d8dff7fad1af Merge: f56d408 e71710c Author: Mattias Ellert <mattias.ellert at fysast.uu.se> Date: Sun Aug 8 23:21:34 2010 +0200 Merge remote branch 'origin/f12/master' ---