[cdk/el6: 10/12] Merge branch 'master' into el6

[Christopher Meng]

commit 835f34d1191b6e4ab94ca8a5fc05d75d039bb095
Merge: 0d1630e 4b9e84f
Author: Christopher Meng <i at cicku.me>
Date:   Fri Jan 24 12:39:48 2014 +0800

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore

 cdk.spec |   92 +++++++++++++++++++++++++++++++++++--------------------------
 sources  |    2 +-
 2 files changed, 54 insertions(+), 40 deletions(-)
---