commit a0c9ded6c18193dbe3726f28e039a4603496fa89 Merge: 6df9d92 d426017 Author: Mattias Ellert <mattias.ellert at fysast.uu.se> Date: Thu Sep 2 09:35:03 2010 +0200 Merge remote branch 'origin/el4/master' ---