commit a6fb0bb7eed524ba8c4e0db75e7de73989972a21 Merge: 11ce660 14ccb30 Author: Mattias Ellert <mattias.ellert at fysast.uu.se> Date: Sun Feb 27 13:35:37 2011 +0100 Merge remote-tracking branch 'origin/el6/master' ---