commit a6cf42b8641cca287344c22025546106519ddf7a Merge: 976cfa8 039c9b9 Author: Mattias Ellert <mattias.ellert at fysast.uu.se> Date: Sun Feb 27 14:54:50 2011 +0100 Merge remote-tracking branch 'origin/el6/master' ---