Merge branch 'bjorn-cleanups' into release

This commit is contained in:
Len Brown 2009-04-05 01:38:42 -04:00
commit e857b33d18
3 changed files with 135 additions and 164 deletions