From 255fbb3379b7cbdc4fd08092fe61c30059ab55a7 Mon Sep 17 00:00:00 2001
From: "J. Brisbin" <jon@jbrisbin.com>
Date: Mon, 14 Mar 2011 08:28:30 -0500
Subject: [PATCH] Merge branches 'master' and 'spring-data-mapping' of
 github.com:SpringSource/spring-data-document into spring-data-mapping