commit 03c0a22dd34b94324bc19b394a3d9af6f9601b1c Merge: 5f34781 b312784 Author: Mattias Ellert <mattias.ellert at fysast.uu.se> Date: Sun Aug 8 20:41:47 2010 +0200 Merge branch 'master' into el5 ---