From 67b73bd645763953716065cb06fbed6b46aa53d5 Mon Sep 17 00:00:00 2001
From: John Schember <john@nachtimwald.com>
Date: Sun, 3 Jan 2010 07:47:41 -0500
Subject: [PATCH] Sync to trunk.