commit 1ad3e22222b4a0bc78c571021a08873e4c9b524a Merge: d1b51ec c45f03b Author: Mattias Ellert <mattias.ellert at fysast.uu.se> Date: Thu Sep 2 13:09:09 2010 +0200 Merge remote branch 'origin/el4/master' ---