[qbzr/f13/master: 11/11] Merge branch 'master' into f13

[Toshio くらとみ]

commit 4f266fd5b64b4b0d12ba1159cdd4b7c81cefadfe
Merge: 63fb4d9 a1f6ac5
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Fri Sep 3 20:15:14 2010 -0400

    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore
    	qbzr.spec
    	sources

 .gitignore |    2 +-
 qbzr.spec  |   10 ++++++++--
 sources    |    2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)
---