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

[Christopher Meng]

commit 34b470498c644cef1e95e2e2a7459dd4b227ca3e
Merge: 48b697c c8ae5ec
Author: Christopher Meng <rpm at cicku.me>
Date:   Wed Dec 4 20:46:26 2013 +0800

    Merge branch 'master' into f18

 .gitignore    |    1 +
 dropbear.spec |   17 ++++++++++-------
 sources       |    2 +-
 3 files changed, 12 insertions(+), 8 deletions(-)
---