commit d1556929ddd721bab0172ccf2ad7db8d926a2f31 Merge: a426faa e8c7535 Author: Mattias Ellert <mattias.ellert at fysast.uu.se> Date: Sat Apr 30 07:56:45 2011 +0200 Merge remote-tracking branch 'origin/el5/master' ---