Merge branches 'release' and 'ppc-workaround' into release

This commit is contained in:
Len Brown 2008-02-07 03:12:17 -05:00
commit 4f4ae0d426