From 088cbe82b968cd43da1eaabc451c4edb6f6beb8c Mon Sep 17 00:00:00 2001
From: brad <chickb@gmail.com>
Date: Fri, 17 Dec 2004 22:03:58 +0000
Subject: [PATCH] Merged changes 436:460 from trunk into insideout branch