commit 86c12cc609eadb28c03d7f4f71368cfd1d4eb34c Merge: 0bedd3b a1c2cc2 Author: Mattias Ellert <mattias.ellert at fysast.uu.se> Date: Tue May 31 07:45:11 2011 +0200 Merge branch 'el6' ---