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

[Rex Dieter]

commit 7e6751a0823f039c8ab0f49262ebde98d6b8441b
Merge: 4552da6 98b1b8e
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Mar 30 13:53:50 2012 -0500

    Merge branch 'master' into f16

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