[kdebindings/f14/master: 5/5] Merge branch 'master' into f14

[Rex Dieter]

commit 1631f21c65ba06d55ce07ea40f01fcab80a17cbb
Merge: fa9ef1e e9274de
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sun Aug 29 14:13:42 2010 -0500

    Merge branch 'master' into f14
    
    Conflicts:
    	.gitignore
    	kdebindings.spec
    	sources

 .gitignore                           |    2 +-
 kdebindings-4.5.1-RUBY_VERSION.patch |   15 +++++++++++++++
 kdebindings.spec                     |   10 +++++++++-
 sources                              |    2 +-
 4 files changed, 26 insertions(+), 3 deletions(-)
---