commit 8390e41c48f630f1e66b8eaf3bf4aa86994cd0fb Merge: 130fcbf 0320bf3 Author: Tim Niemueller <niemueller at kbsg.rwth-aachen.de> Date: Sat Nov 6 15:50:50 2010 -0400 Merge branch 'master' into el6 ---