f647827 Update to version from master (differs only in ID)

Authored and Committed by Nalin Dahyabhai 11 years ago
    Update to version from master (differs only in ID)
    
    Update this patch to the version from upstream's master branch, which
    only changes the commit ID.