[phpMyAdmin/el4/master: 35/35] Merge remote branch 'origin/el5/master' into el4

[Robert Scheck]

commit a50323a242d7d46bb73ccfe761f985aa172dacbf
Merge: 458d849 81df530
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Fri Aug 20 22:11:10 2010 +0200

    Merge remote branch 'origin/el5/master' into el4
    
    Conflicts:
    	.gitignore
    	phpMyAdmin.spec
    	sources

 .gitignore      |    2 +-
 phpMyAdmin.spec |    5 ++++-
 sources         |    2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)
---