20777fae87
Merge commit '584bce31b62cdf3efd8a9eb40442c4cc612ce1e6' into eclair-mr2 * commit '584bce31b62cdf3efd8a9eb40442c4cc612ce1e6': Fix the build (hopefully.)