commit 24fd3b1401c8ad7b17a2a39d03b378a2816bccd6 Merge: e5d02fb c92182a Author: Tim Niemueller <niemueller at kbsg.rwth-aachen.de> Date: Tue Nov 9 09:10:00 2010 -0500 Merge branch 'master' into el6 ---