commit c2858f8e2ea09e19b02b3480eeb1d7bdca27310e Merge: 9e0348e 1cabed2 Author: Mattias Ellert <mattias.ellert at fysast.uu.se> Date: Sun Aug 8 23:21:43 2010 +0200 Merge remote branch 'origin/el6/master' ---