commit a2f7a5a43295ee1b7184bc3c195d9f485594124e Merge: 33e060f 80598fb Author: Mattias Ellert <mattias.ellert at fysast.uu.se> Date: Sun Feb 27 17:00:52 2011 +0100 Merge remote-tracking branch 'origin/el6/master' ---