Patch merged into coreboot/master: cbfstool: Deduplicate code to merge empty files

the following patch was just integrated into master:
commit 4d1c5aa9f7f61fcc7969391f53a66026cb657a3f
Author: Patrick Georgi 
Date:   Fri Jul 17 22:07:26 2015 +0200

cbfstool: Deduplicate code to merge empty files

The code for removing a file had its own merge routine. Use the generic one
    instead.

Change-Id: I90ed007ab86f78a2728f529fa0143c5c1dfbbdc3
    Signed-off-by: Patrick Georgi 
    Reviewed-on: http://review.coreboot.org/10967
    Tested-by: build bot (Jenkins)
    Reviewed-by: Aaron Durbin

See http://review.coreboot.org/10967 for details.

-gerrit