From 9f566a7310dda5c0589b591ad4c0100a3d91d0df Mon Sep 17 00:00:00 2001
From: j2blake <j2blake@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Wed, 20 Jul 2011 20:30:57 +0000
Subject: [PATCH] Merge r3344 from release 1.3 branch