commit 7a540f487547b33ef0601fca31041b868f847991 Merge: 6e4c6ab 7e719f3 Author: Mattias Ellert <mattias.ellert at fysast.uu.se> Date: Sun Feb 27 15:42:23 2011 +0100 Merge remote-tracking branch 'origin/el6/master' ---