commit 5010f888807317ec51e6c0ef9fa0e2d1fc0eef84 Merge: d7bdd11 0da29d7 Author: Mattias Ellert <mattias.ellert at fysast.uu.se> Date: Sun Feb 27 17:13:55 2011 +0100 Merge remote-tracking branch 'origin/el6/master' ---