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

[Than Ngo]

commit 2574676ab7f35c2346b09cfcafca14954a3195c6
Merge: 4618709 9e0de5f
Author: Than Ngo <than at redhat.com>
Date:   Thu Mar 7 14:12:48 2013 +0100

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

 .gitignore   |    1 +
 blinken.spec |   21 ++++++++++++++++++---
 sources      |    2 +-
 3 files changed, 20 insertions(+), 4 deletions(-)
---
diff --cc .gitignore
index 4cf3c7f,2662052..23c69ca
--- a/.gitignore
+++ b/.gitignore
@@@ -1,6 -1,1 +1,7 @@@
 +/blinken-4.8.5.tar.xz
 +/blinken-4.9.1.tar.xz
 +/blinken-4.9.2.tar.xz
 +/blinken-4.9.3.tar.xz
 +/blinken-4.9.4.tar.xz
 +/blinken-4.9.5.tar.xz
+ /blinken-4.10.1.tar.xz