commit 3e1afb491668dc068aa8ad8b40b9633bea24ef35 Merge: 0ca6545 58725ff Author: Mattias Ellert <mattias.ellert at fysast.uu.se> Date: Wed Sep 1 10:21:25 2010 +0200 Merge remote branch 'origin/el4/master' ---