Merge proposals dependent on lp://staging/~facundo/ubuntu/lucid/pyinotify/fix-path-overlap

1. Lucid (10.04)
2. fix-path-overlap
3. Dependent merge proposals