commit 4526fd1159ee161f4fdae46511934ab9e5bf3880 Merge: 596e587 f987db2 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' ---