[kdebindings/f14/master: 6/6] Merge remote branch 'origin/master' into f14/master

[Rex Dieter]

commit 8ee7d90dd5ad2424feb3a65fcbf056fb20f26a60
Merge: a0feccd 409edce
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Oct 2 22:43:44 2010 -0500

    Merge remote branch 'origin/master' into f14/master
    
    Conflicts:
    	kdebindings.spec

 .gitignore                           |    2 +-
 kdebindings-4.5.1-RUBY_VERSION.patch |   15 --------
 kdebindings-4.5.1-sip_api_8.patch    |   65 ++++++++++++++++++++++++++++++++++
 kdebindings.spec                     |   22 +++++++++---
 sources                              |    2 +-
 5 files changed, 84 insertions(+), 22 deletions(-)
---