[ark/f18: 2/2] Merge branch 'master' into f18

[Than Ngo]

commit df3db2a617fb837ee5f3ee1c93379a18acd03180
Merge: 8f32721 13c0c1a
Author: Than Ngo <than at redhat.com>
Date:   Wed Apr 24 22:49:27 2013 +0200

    Merge branch 'master' into f18

 ark.spec |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)
---