Merge remote branch 'bgianfo/master'

This was already merged (by cherry-pick) but aparently github doesn't
detect that, so this will hopefully properly show that these patches
have been pulled in.
This commit is contained in:
Scott R. Parish 2010-02-06 14:58:59 -06:00
commit 6b64ef81d8

Diff content is not available