Merge branch 'dell-laptop' into release

This commit is contained in:
Len Brown 2009-12-15 22:35:31 -05:00
commit 6cbef9fd7c
2 changed files with 62 additions and 37 deletions