From 973a872860156d83e9244f3877a9aed07e65773d Mon Sep 17 00:00:00 2001
From: Eric Smith <eric@trueblade.com>
Date: Sat, 23 Feb 2008 03:11:44 +0000
Subject: [PATCH] Blocked r60970 with svnmerge.