[qoauth/f12/master: 7/7] Merge branch 'master' into f12

[supercyper]

commit ec15eb820d116332671e174e57465a07d4d902ae
Merge: 9e67dd7 ef6bbc3
Author: Chen Lei <supercyper at 163.com>
Date:   Sun Aug 8 07:38:27 2010 -0600

    Merge branch 'master' into f12

 .gitignore  |    2 +-
 qoauth.spec |   19 +++++++++----------
 sources     |    2 +-
 3 files changed, 11 insertions(+), 12 deletions(-)
---