update B2G/Gaia to 2013-06-06 tips of b2g18/v1-train branches
Merge pull request #589 from mykmelez/update-b2g-gaia

update B2G/Gaia to 2013-06-06 tips of b2g18/v1-train branches