commit b1db980104b011626f92edb36cfda4582d44df67 Merge: 26945f1 fd0f52a 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' ---