commit 49a7b1da992ad51d75200135018147472d8d9b2a Merge: 1d2c99e 7b6c699 Author: Hicham HAOUARI <hicham.haouari at gmail.com> Date: Tue Sep 14 14:29:10 2010 +0000 Merge branch 'master' of ssh://pkgs.fedoraproject.org/chatzilla ---