commit 282b5102f696d455c9fab5a721b018628d4d9c29 Merge: c40b266 0483df5 Author: Mattias Ellert <mattias.ellert at fysast.uu.se> Date: Sat Apr 30 07:56:45 2011 +0200 Merge remote-tracking branch 'origin/el5/master' ---