[smokekde/f16: 2/2] Merge branch 'master' into f16

[Rex Dieter]

commit a32bcb6ccabcd975d189397a1467bc66f04c5f20
Merge: 17b693a 7c3c821
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Mar 30 12:21:42 2012 -0500

    Merge branch 'master' into f16

 .gitignore    |    1 +
 smokekde.spec |    7 +++++--
 sources       |    2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)
---