[be/el5: 4/4] Merge branch 'master' into el5

[Michel Alexandre Salim]

commit e11fb7f086cec327bdc0e93eef4d68dd71eafbfd
Merge: 7ad1db0 d9736f8
Author: Michel Alexandre Salim <salimma at fedoraproject.org>
Date:   Thu Jul 14 14:33:51 2011 +0200

    Merge branch 'master' into el5

 .gitignore |    2 +-
 be.spec    |    7 +++++--
 sources    |    2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)
---