commit 2ba6c6ec3a8747439548267f5a40555850a49a6c Merge: 0cfb384 4a94ba6 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' ---