commit 3a23ad7be2c1e429730047278a7f9c40a986faec Merge: aaaad26 05dd9b4 Author: Mattias Ellert <mattias.ellert at fysast.uu.se> Date: Mon Oct 4 15:36:39 2010 +0200 Merge remote branch 'origin/el5/master' ---