From 3e135f1ca18fc9289ae78df1073dfea805a0e56b Mon Sep 17 00:00:00 2001
From: bkoniden <bkoniden@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Sat, 20 Nov 2010 00:27:29 +0000
Subject: [PATCH] merging from the branch (r6510), to the trunk.