[blinken/f16: 9/9] Merge remote-tracking branch 'origin/f17' into f16

[Rex Dieter]

commit 4552da6ae8be9f6b28beb686af948bcd67ad97c3
Merge: 754bc74 0f7601f
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Mar 8 00:18:23 2012 -0600

    Merge remote-tracking branch 'origin/f17' into f16
    
    Conflicts:
    	.gitignore
    	blinken.spec
    	sources

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