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

[Than Ngo]

commit 5d828025abff05b02b6b1e5b3aedd251dded79ab
Merge: 1eabec1 13c0c1a
Author: Than Ngo <than at redhat.com>
Date:   Wed Apr 24 22:50:02 2013 +0200

    Merge branch 'master' into f17

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