commit 6029b64dd777b6ba7ee7273f0cad5e978822cd60 Merge: f71c3a9 344078d 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' ---