commit 7057154b385c9f2e83704566a46a3db3464c8c22 Merge: c3675a7 5a93e20 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' ---