commit 89b2eec742381b1f80947d11ae4899fae47afc33 Merge: 70cb53e 66a9a84 Author: Mattias Ellert <mattias.ellert at fysast.uu.se> Date: Tue Aug 30 23:58:46 2011 +0200 Merge remote-tracking branch 'origin/el4' ---