commit d2b7ee463969935871798825bb5808edc97dadd5 Merge: c9438b8 c781af1 Author: Mattias Ellert <mattias.ellert at fysast.uu.se> Date: Tue Mar 29 15:00:13 2011 +0200 Merge remote-tracking branch 'origin/el6/master' ---