[liboauth/f14/master: 6/6] Merge branch 'master' into f14

[Michel Alexandre Salim]

commit 38001cb01083a1609f5265c4706fb93386f7c693
Merge: afd5f04 32870ad
Author: Michel Alexandre Salim <salimma at fedoraproject.org>
Date:   Sat Mar 12 23:12:44 2011 +0100

    Merge branch 'master' into f14
    
    Conflicts:
    	liboauth.spec

 .gitignore    |    2 +-
 liboauth.spec |   20 ++++++++++++++++----
 sources       |    2 +-
 3 files changed, 18 insertions(+), 6 deletions(-)
---