commit 7ea30b7c75760b2fc4a2a649ba2dc4bc541b9e06 Merge: 9ef0f26 89f39dc Author: Mattias Ellert <mattias.ellert at fysast.uu.se> Date: Mon Dec 13 18:23:47 2010 +0100 Merge remote branch 'origin/el5/master' into el4 ---