commit 7b254c7469fab7aeadd417707f856e4e40ec6d41 Merge: 2cb09c7 5ddfeaf Author: Mattias Ellert <mattias.ellert at fysast.uu.se> Date: Thu Nov 10 14:05:28 2011 +0100 Merge remote-tracking branch 'origin/f15' ---