commit d1b51ecde5e5b6e176211d168be35baf14243449 Merge: 73569ba 8ef25f2 Author: Mattias Ellert <mattias.ellert at fysast.uu.se> Date: Thu Sep 2 13:09:07 2010 +0200 Merge remote branch 'origin/el5/master' ---