[smstools/f18: 6/6] Merge branch 'master' into f18

[pcfe]

commit 2b5240872a63105c7b90d4d9b47d56c3ee0dbdc2
Merge: 65d4fa9 3837b11
Author: Patrick C. F. Ernzer <pcfe at pcfe.net>
Date:   Thu May 23 16:18:43 2013 +0200

    Merge branch 'master' into f18

 smsd.tmpfiles                       |    1 +
 smstools.spec                       |   35 +++++++++++++++++++++++++++++++----
 smstools3-3.1.15-rundirectory.patch |   12 ++++++++++++
 3 files changed, 44 insertions(+), 4 deletions(-)
---