commit acb9eeee10efc236a417f1c55d0d5524e23131c1 Merge: a6f8a77 0ce62a8 Author: Mattias Ellert <mattias.ellert at fysast.uu.se> Date: Sun Feb 27 14:45:29 2011 +0100 Merge remote-tracking branch 'origin/el5/master' ---