Added by Guido Trotter about 15 years ago
Merge branch 'master' into next
Signed-off-by: Guido Trotter <ultrotter@google.com>