commit 7e87569a96be3b773eeb4ff2c03b5f783c3706eb Merge: cee9163 3ed1756 Author: Mattias Ellert <mattias.ellert at fysast.uu.se> Date: Sat Apr 30 07:56:50 2011 +0200 Merge remote-tracking branch 'origin/el4/master' ---