[expresso/f18: 5/5] Merge branch 'master' into el6

[Jamie Nguyen]

commit 64c7ac9c26fa5cbb30f291dfbfdc87c556af605c
Merge: 96d4685 a456c55
Author: Jamie Nguyen <j at jamielinux.com>
Date:   Sun Aug 18 16:03:47 2013 +0100

    Merge branch 'master' into el6

 expresso.spec |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 deletions(-)
---