commit 3732fe78a519dd20c751cd12332d5317a223a3e6 Merge: d6cf0c4 0b5adce 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' ---