Added by Constantinos Venetsanopoulos almost 12 years ago
Merge remote branch 'google/stable-2.5' into grnet-2.5-rbd-devel