From 1c0a281830e8f65bc2af4dedfeacc8ac029586e9 Mon Sep 17 00:00:00 2001
From: Peter Dimov <pdimov@pdimov.com>
Date: Sat, 12 Jul 2008 09:06:42 +0000
Subject: [PATCH] Save state before 1.36 merges.

[SVN r47337]