fixed patch after merge

This commit is contained in:
Anand Doshi 2012-09-28 12:41:18 +05:30
parent b83307823b
commit 9e9996dbc9