Merge branches 'release' and 'dmi' into release

This commit is contained in:
Len Brown 2008-02-07 03:11:31 -05:00
commit 5531d28504
4 changed files with 44 additions and 39 deletions