[ark/f17: 13/13] Merge branch 'master' into f17

[Rex Dieter]

commit c8d90b0a98448d676d3be7fa6bfd006fd9d58471
Merge: 9fb30e1 afb1f2a
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Sep 5 14:32:38 2012 -0500

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

 .gitignore |    3 +--
 ark.spec   |   34 ++++++++++++++++++++++++++--------
 sources    |    2 +-
 3 files changed, 28 insertions(+), 11 deletions(-)
---