Dora - merging before switching the Gumstix repository to normal mode

adam-lee should fork gumstix, not the other way around