commit 58dd2cc3e9ee1a0d48fd4fbc745f588a21ccca37 Merge: f0fab5d 3160636 Author: Mattias Ellert <mattias.ellert at fysast.uu.se> Date: Sat Nov 6 20:33:14 2010 +0100 Merge remote branch 'origin/el4/master' ---