commit aaaad26ac7d927b0bdb518f2e446454949305ad4 Merge: 887af4b a9a5588 Author: Mattias Ellert <mattias.ellert at fysast.uu.se> Date: Mon Oct 4 15:36:03 2010 +0200 Merge remote branch 'origin/el6/master' ---