commit 73569ba5bf59b2495ba67046da23925f4c0f31d5 Merge: b07c542 8a8f603 Author: Mattias Ellert <mattias.ellert at fysast.uu.se> Date: Thu Sep 2 13:09:04 2010 +0200 Merge remote branch 'origin/el6/master' ---