Merge branches 'release' and 'hp-cid' into release

This commit is contained in:
Len Brown 2008-02-07 03:11:56 -05:00
commit d870ec7281