commit 24faf33edcf4e7572f5b444266ac4c2c0ee5cee0 Merge: f61e0cb c600d77 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' ---