[kbibtex/f16: 3/3] Merge branch 'master' into f16

[cheeselee]

commit 42e28a7b87c7ce11c9984197b6f1aca6d744ac4d
Merge: 170e68a 62547ff
Author: Robin Lee <cheeselee at fedoraproject.org>
Date:   Tue Nov 29 23:51:44 2011 +0800

    Merge branch 'master' into f16
    
    Conflicts:
    	kbibtex.spec

 .gitignore   |    1 +
 kbibtex.spec |   20 +++++++++++++-------
 sources      |    2 +-
 3 files changed, 15 insertions(+), 8 deletions(-)
---