From 4b559b912f5a3aa02a226fdacddaa3b80a8ade42 Mon Sep 17 00:00:00 2001
From: Marc Alff <marc.alff@sun.com>
Date: Wed, 6 Jan 2010 14:26:03 -0700
Subject: [PATCH] Merge mysql-next-mr (revno 2955) --> mysql-next-mr-marc