commit d44ef0d8381d19e4bf098caeef232488994322c5 Merge: 42cf890 5d9d6e7 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' ---