Merge proposals

Vidalia has no merge proposals.