update B2G/Gaia to 2013-05-22 tips of b2g18/v1-train branches
Merge branch 'master' into update-b2g-gaia
Merge pull request #552 from mykmelez/update-b2g-gaia

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