Merge branch 'gpe-defer' into release

This commit is contained in:
Len Brown 2010-10-25 02:13:09 -04:00
commit 6e04c417ae
13 changed files with 94 additions and 140 deletions