Pull dock into release branch

This commit is contained in:
Len Brown 2007-04-28 23:13:03 -04:00
commit 14d2178588