[k3b/f13/master: 3/3] Merge remote branch 'origin/master' into f13/master

[Rex Dieter]

commit c79f7108f6e08ee7e6584e849af505bce23bf276
Merge: f853761 8d6c8a5
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Aug 31 12:05:39 2010 -0500

    Merge remote branch 'origin/master' into f13/master

 .gitignore |    3 +--
 k3b.spec   |   17 +++++++----------
 sources    |    3 +--
 3 files changed, 9 insertions(+), 14 deletions(-)
---