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

[Christopher Meng]

commit 3d3a755c7ed10dd1055491f84a3b1197e6025939
Merge: 835f34d 5275941
Author: Christopher Meng <i at cicku.me>
Date:   Fri Jan 24 12:41:34 2014 +0800

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore

 .gitignore |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---