Patch merged into master: ad9b1d8 Adapt filo to libpayload changes

the following patch was just integrated into master:
commit ad9b1d81d3f46ccab9e7fc5570b0b8d495386547
Author: Patrick Georgi 
Date:   Fri Jul 22 10:00:38 2011 +0200

Adapt filo to libpayload changes

libpayload comes with CBFS and LZMA support now, and FILO's copy
    leads to conflicts (which is what the libpayload copy intends to solve)

Change-Id: I1c70eda7b260d7149c7079cb0d681c274f510ed8
    Signed-off-by: Patrick Georgi

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

-gerrit