commit bed85cef8d83221f068fd3bd9cba90ab4532a211 Merge: 97403fd f22eb6f Author: Volker Fröhlich <volker27 at gmx.at> Date: Mon Jul 11 22:03:06 2011 +0200 Merge branch 'master' into el6 ---