commit dbb43d80d59cbc3802bdcdeb9ba23281030ee6a7 Merge: da4d908 068274a Author: Matthias Saou <thias at marmotte.net> Date: Tue Jul 12 19:40:29 2011 +0200 Merge branch 'el5' into el4 ---