[m-rev.] for review: fix mantis bug 404

[Peter Wang]

On Fri, 30 Sep 2016 04:44:33 +0200 (CEST), "Zoltan Somogyi" <zoltan.somogyi at runbox.com> wrote:
> For review by Peter. The basic approach is the one you suggested.
> 
> Fix the operation of --rebuild.
> 
> This fixes mantis bug #404.

Thanks, Zoltan.  That looks good.

Peter