commit edcde676ca1f240c09fdaebac7f8602aa2f5fd59 Merge: a8d0bc7 eb0f219 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' ---