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

[Maxim Burgerhout]

commit 199c13c05467533b8f4af49efb5199b4f6858f58
Merge: f1ea2f5 03b4ea2
Author: Maxim Burgerhout <maxim at wzzrd.com>
Date:   Thu Nov 28 14:46:18 2013 +0100

    Merge branch 'master' into f18

 .gitignore  |    1 +
 sources     |    2 +-
 ykpers.spec |   19 +++++++++++++++----
 3 files changed, 17 insertions(+), 5 deletions(-)
---