[blinken/f16: 2/2] Merge branch 'f17' into f16

[Rex Dieter]

commit 05ad4f527d4dda326b2e239fcd6ad6b331983f3f
Merge: f76580a cc355d6
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Jun 7 20:12:11 2012 -0500

    Merge branch 'f17' into f16

 .gitignore   |    1 +
 blinken.spec |    5 ++++-
 sources      |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---