Merge branch 'acer' into release

This commit is contained in:
Len Brown 2009-04-05 01:42:03 -04:00
commit 07290bed79
2 changed files with 40 additions and 5 deletions