From 9f76e4f127754fcea7f3bf974fc1036d6e799f9b Mon Sep 17 00:00:00 2001
From: Jesse Noller <jnoller@gmail.com>
Date: Tue, 2 Sep 2008 18:44:13 +0000
Subject: [PATCH] unblock 66115 from merging