commit 6cdae1ac20f4e620d43ed916802c83e4b1a115ea Merge: 9238f2c fcad1dd Author: Mattias Ellert <mattias.ellert at fysast.uu.se> Date: Sun Feb 27 16:47:07 2011 +0100 Merge remote-tracking branch 'origin/el6/master' ---