commit f5ddd6ebe4312dd6052d7d2e95ecbd795f96c147 Merge: 8b1e7dd 9767ad0 Author: Mattias Ellert <mattias.ellert at fysast.uu.se> Date: Wed Sep 1 10:21:18 2010 +0200 Merge remote branch 'origin/el6/master' ---