[marked/f18: 5/5] Merge branch 'master' into f18

[Jamie Nguyen]

commit 6b0dcfcf81fb21a109b987e2aacafb16e2ac8aa1
Merge: 1d675c3 f0113ba
Author: Jamie Nguyen <j at jamielinux.com>
Date:   Sun Aug 18 16:13:17 2013 +0100

    Merge branch 'master' into f18

 marked.spec |   18 +++++++++++++++---
 1 files changed, 15 insertions(+), 3 deletions(-)
---