commit 7510e1c11645db5295adb75a702cee5b2beaf6be Merge: c2858f8 03c0a22 Author: Mattias Ellert <mattias.ellert at fysast.uu.se> Date: Sun Aug 8 23:21:47 2010 +0200 Merge remote branch 'origin/el5/master' ---