Whamcloud - gitweb
Land b1_2_smallfix onto b1_2 (20040610_1244)