commit 0ca65452002a9536dbe0c103bb102588073b760e Merge: f5ddd6e 8210558 Author: Mattias Ellert <mattias.ellert at fysast.uu.se> Date: Wed Sep 1 10:21:22 2010 +0200 Merge remote branch 'origin/el5/master' ---