Merge proposals

satyadev svn has no merge proposals.