commit 518e941ccccf95593c7f3738af79356cf0b64f57 Merge: 48368e2 0445e87 Author: Mattias Ellert <mattias.ellert at fysast.uu.se> Date: Sat Nov 6 20:32:52 2010 +0100 Merge remote branch 'origin/f13/master' ---