commit 381d28e05688bfda7864fe8496cceebdfa7564eb Merge: 7b254c7 4dd39f2 Author: Mattias Ellert <mattias.ellert at fysast.uu.se> Date: Thu Nov 10 14:05:34 2011 +0100 Merge remote-tracking branch 'origin/el6' ---