Added by Constantinos Venetsanopoulos about 12 years ago
Merge remote branch 'google/master' into debian-2.5+