Pull sony into release branch
Len Brown [Sun, 22 Jul 2007 06:27:56 +0000 (02:27 -0400)]

Trivial merge