rollbacked and added one line from local

http://msysgit.github.com/
Revert "rollbacked and added one line from local"

This reverts commit 8863cf6fa76247a3b90d2890ed426d376200659d.
Revert "Revert "rollbacked and added one line from local""

This reverts commit 0fdae847da26a8e8512310028ff6f7951c1db3e2.
resolved the conflictcs between local and remote