r15768@deathmachine (orig r470): groditi | 2008-01-07 19:52:08 -0500
groditi [Thu, 10 Jan 2008 22:44:58 +0000 (22:44 +0000)]
 pulling in changes from trunk


Trivial merge