[dropbear/f18: 12/12] Merge branch 'master' into f18

[Christopher Meng]

commit f1d9170e3729dbdd4ed2041c0d135e49a36186d2
Merge: e163e7b 8ced33b
Author: Christopher Meng <rpm at cicku.me>
Date:   Tue May 21 15:08:04 2013 +0800

    Merge branch 'master' into f18

 dropbear-keygen.service |    3 ++-
 dropbear.service        |    5 ++---
 dropbear.spec           |   31 ++++++++++++++++++-------------
 3 files changed, 22 insertions(+), 17 deletions(-)
---