commit 5500a95b4353063c0d8cf6358bdd8087d617d6f7 Merge: 5b902b1 f478549 Author: Mattias Ellert <mattias.ellert at fysast.uu.se> Date: Thu Sep 2 09:34:43 2010 +0200 Merge remote branch 'origin/f13/master' ---