Summary: Update for files that have been modified starting July 2008
Reviewed-by: ohair, tbell

Summary: Fix to allow mutiple blanks between options
Reviewed-by: tbell