424dfsd123

Signed-off-by: wang <wang@wang-PC>
Merge branch 'master' of https://git@github.com/wisegps/baba.git
liu 2014_9_12

Signed-off-by: wang <wang@wang-PC>
2014——9——12dfs

Signed-off-by: wang <wang@wang-PC>