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

[Rex Dieter]

commit f76580a402d2f8c9dbb303f97fc42f10e8101065
Merge: 7e6751a f5df711
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Apr 30 22:52:49 2012 -0500

    Merge branch 'master' into f16

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