[phpMyAdmin/f13/master: 7/7] Merge remote branch 'origin/master' into f13

[Robert Scheck]

commit b56f3c37727b443d3af616af273445e36627d186
Merge: 01302d5 ac8c600
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Fri Aug 20 22:56:37 2010 +0200

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

 .gitignore                    |    2 +-
 phpMyAdmin-3.3.5-mysqli.patch |   16 ++++++++++++++++
 phpMyAdmin.spec               |    8 +++++++-
 sources                       |    2 +-
 4 files changed, 25 insertions(+), 3 deletions(-)
---