Merge branch 'lua' of nslu34:disk/projects/SDLBotor into lua