Pull dock into test branch

This commit is contained in:
Len Brown 2006-12-16 00:33:45 -05:00
commit fb7665544d