commit b07c542de9e0d8d79b6db2aa0636bf6a47eb9496 Merge: 910835f d96dea0 Author: Mattias Ellert <mattias.ellert at fysast.uu.se> Date: Thu Sep 2 13:09:00 2010 +0200 Merge remote branch 'origin/f12/master' ---