commit 9e71f16137e477853f25aaf0211ed2d2c6211bec Merge: a62efb2 1ddc304 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' ---