commit e0f0439fd4955470fa085c3d7bfc11de21b046f7 Merge: 7a08949 a5e5e6d Author: Mattias Ellert <mattias.ellert at fysast.uu.se> Date: Sun Feb 27 15:21:26 2011 +0100 Merge remote-tracking branch 'origin/el5/master' ---