commit 6df9d92cddef50ba628989ef52110de37533ce7e Merge: 98206e9 fac3f92 Author: Mattias Ellert <mattias.ellert at fysast.uu.se> Date: Thu Sep 2 09:35:00 2010 +0200 Merge remote branch 'origin/el5/master' ---