commit 976a5a4eedb8549ccc3a94672701565bcd1f4b2d Merge: cc045a3 a852a04 Author: Till Maas <opensource at till.name> Date: Mon Aug 15 18:38:37 2011 +0200 Merge branch 'el5' into el6 ---