Merge commit 'e4260f4e7da4da32bfab2737018cf9cf75215894' into eclair-mr2 * commit 'e4260f4e7da4da32bfab2737018cf9cf75215894': Fix build.