Merge remote-tracking branch 'yselkowitz/master'

I checked this patch with diff -w to check that it only affected
whitespace.
This commit is contained in:
Keith Packard 2012-12-19 12:21:31 -08:00
commit 0eb1559eb2
68 changed files with 335 additions and 335 deletions