am dbc5c711: Merge "(GB/GBMR) (do not merge) delete file from disk when deleting...
Vasu Nori [Sun, 16 Jan 2011 21:20:18 +0000 (13:20 -0800)]
* commit 'dbc5c7118e00932182b0f5dfef44d388a174d4d5':
  (GB/GBMR) (do not merge) delete file from disk when deleting from db


Trivial merge