commit d32d63337b89dcd795d7d8aca1fd7ff8907c4f7b Merge: 13a812e 01aae5f 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' ---