commit 69467eb996f52dc89a8b391b2e3c5384f56269ab Merge: b87172d 8e06b08 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' ---