[leechcraft/f16: 9/9] Merge branch 'f17' into f16

[Minh Ngo]

commit 87bac03581322971ea430b1ed6498bc593077eee
Merge: e7536b4 f0f3577
Author: Minh Ngo <nlminhtl at gmail.com>
Date:   Sun Sep 30 14:02:23 2012 +0300

    Merge branch 'f17' into f16
    
    Conflicts:
    	leechcraft.spec

 leechcraft.spec |   43 +++++++++++++++++++++++++++++++++++--------
 1 files changed, 35 insertions(+), 8 deletions(-)
---