[tsung/f19: 2/2] Merge branch 'master' into f20

[Christopher Meng]

commit 016e247f8c3c92f356a116227feb24726b9a1f4a
Merge: 608f999 f224fec
Author: Christopher Meng <i at cicku.me>
Date:   Fri Jul 18 12:19:22 2014 +0800

    Merge branch 'master' into f20

 tsung.spec |   21 ++++++++++++++++-----
 1 files changed, 16 insertions(+), 5 deletions(-)
---