On Fri, May 11, 2012 at 11:56:02PM -0700, Olof Johansson wrote: > Pulled, thanks. The conflicts were reasonably contained, but please > make sure I resolved them right. > Thanks, Olof. It looks all right. -- Regards, Shawn