am 965f9dc4: merge -s ours from froyo-release so that upgrading to gingerbread...
am 965f9dc4: merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward
Merge commit '965f9dc4' into gingerbread-plus-aosp
* commit '965f9dc4':
fix bug in applying patches
remove shadowed variable declaration