[blinken/f18: 7/7] Merge branch 'master' into f18

[Than Ngo]

commit a03fd6148df8a88c976f24bc98bcd44a9ef6f5cb
Merge: 1c1c1a7 9e0de5f
Author: Than Ngo <than at redhat.com>
Date:   Mon Mar 4 13:49:45 2013 +0100

    Merge branch 'master' into f18
    
    Conflicts:
    	.gitignore
    	blinken.spec
    	sources

 .gitignore   |    7 +------
 blinken.spec |   21 ++++++++++++++++++---
 sources      |    2 +-
 3 files changed, 20 insertions(+), 10 deletions(-)
---