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

[Than Ngo]

commit 68533d677ea3a0259baac95c127fa24ebcf62211
Merge: c33b350 81a49a8
Author: Than Ngo <than at redhat.com>
Date:   Fri Dec 7 10:17:30 2012 +0100

    Merge branch 'f18' into f17

 .gitignore |    1 +
 ark.spec   |    5 ++++-
 sources    |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---