commit a62efb2a85f1b1e940d4d4c78722d688327d582e Merge: cefcb2b e8a1361 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' ---