commit 3003d69353817618342f3f425aa92b32e98f5b71 Merge: 52c335e b312784 Author: Mattias Ellert <mattias.ellert at fysast.uu.se> Date: Sun Aug 8 23:16:06 2010 +0200 Merge branch 'master' into el4 ---