IMPORTANT Please Read: Merging Now

Hi all,

I'm going to start the merge that I told you about last night. This
won't take long, but during that time commit message emails will be
disabled. Please hold off committing new patches until we're finished.

Sorry for the inconvenience.

-bw