commit 862b7d4844267a60d5c8826aae407031be38e090 Merge: 928ef70 c2958d0 Author: Tim Niemueller <niemueller at kbsg.rwth-aachen.de> Date: Mon Nov 8 18:19:58 2010 -0500 Merge branch 'master' into el6 ---