Merge nslu2-linux@nslu2-linux.bkbits.net:openembedded