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

[Toshio くらとみ]

commit 47c852e2375d24aa9efacdec6e16940d97e1e084
Merge: bcaf4a8 a1f6ac5
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Fri Sep 3 20:25:00 2010 -0400

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

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