commit 6b820a1422337dcef9162004481d31f6cfe9d3a2 Merge: 381d28e 4b7af2a Author: Mattias Ellert <mattias.ellert at fysast.uu.se> Date: Thu Nov 10 14:05:36 2011 +0100 Merge remote-tracking branch 'origin/el5' ---