commit d5ac9891f518347edb0140d2a782bacdc4c689e6 Merge: 7cabab7 c499a18 Author: Mattias Ellert <mattias.ellert at fysast.uu.se> Date: Sat Apr 30 07:56:39 2011 +0200 Merge remote-tracking branch 'origin/el6/master' ---