commit 115a3fd5e64797040f2b7e3c6c15bbb4f248ebe7 Merge: 3e8c37d 780d3b7 Author: Mattias Ellert <mattias.ellert at fysast.uu.se> Date: Sat Apr 30 07:56:21 2011 +0200 Merge remote-tracking branch 'origin/f13/master' ---