[systemd: 17/17] Merge branch 'f18'

[Lennart Poettering]

commit 13bcb3261faf0ca8a43a8654518992cc055d248d
Merge: 1041095 e7fd3d9
Author: Lennart Poettering <lennart at poettering.net>
Date:   Thu Sep 20 22:06:04 2012 +0200

    Merge branch 'f18'

 90-default.preset |   78 +++++++++++++++++++++++++++++++
 99-default.preset |   11 ----
 sources           |    2 +-
 systemd.spec      |  132 +++++++++++++++++++++++++++++++++++++++++++++++------
 4 files changed, 196 insertions(+), 27 deletions(-)
---