commit 1d256c4a0abd7bc90db6213db8df18704dcb23b0 Merge: 24faf33 7ad4def 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' ---