commit e953ed08e1f8bdde7507f98611f1270665d634c5 Merge: b82099c 8cc59b9 Author: Tim Niemueller <niemueller at kbsg.rwth-aachen.de> Date: Mon Nov 8 18:18:16 2010 -0500 Merge branch 'master' into el6 ---