From f20a8dc6ea523716bae877c12640a268ba883f5e Mon Sep 17 00:00:00 2001
From: Marc Alff <marc.alff@sun.com>
Date: Thu, 21 Jan 2010 08:47:05 -0700
Subject: [PATCH] Merge mysql-next-mr (revno 2966) --> mysql-next-mr-marc