commit 0e11a6835f1f8f83205487b646dbb68d483d7539 Merge: 077fc12 5d92df5 Author: Mattias Ellert <mattias.ellert at fysast.uu.se> Date: Thu Feb 10 06:37:17 2011 +0100 Merge remote-tracking branch 'origin/el5/master' ---