[i3/f17: 3/3] Merge branch 'master' into f17

[Martin Preisler]

commit 881f7927eadc054791eec67b3c3e2bd75345077d
Merge: 6ba3830 cdc76f6
Author: Martin Preisler <mpreisle at redhat.com>
Date:   Wed Jun 6 14:33:32 2012 +0200

    Merge branch 'master' into f17
    
    Conflicts:
    	i3.spec
    	sources

 fedora-i3-4.2-common.mk |  132 +++++++++++++++++++++++++++++++++++++++++++++++
 i3.spec                 |    9 +++-
 sources                 |    2 +-
 3 files changed, 140 insertions(+), 3 deletions(-)
---