Merge branch 'master' into hadoop-os-build
Merge remote-tracking branch 'origin/hadoop-os-build' into hadoop-os-build
Merge branch 'master' into hadoop-os-build
Merge remote-tracking branch 'origin/hadoop-os-build' into hadoop-os-build
Merge branch 'master' into hadoop-os-build
Merge remote-tracking branch 'origin/hadoop-os-build' into hadoop-os-build
Merge remote-tracking branch 'origin/hadoop-os-build' into hadoop-os-build
Merge branch 'master' into hadoop-os-build
Merge remote-tracking branch 'origin/hadoop-os-build' into hadoop-os-build
Merge remote-tracking branch 'origin/hadoop-os-build' into hadoop-os-build
Merge remote-tracking branch 'origin/hadoop-os-build' into hadoop-os-build
Merge branch 'master' into hadoop-os-build
Eschew barclamp merge conflicts.
Merge branch 'release/rails3anddb/hadoop-os-build' into hadoop-os-build
Move barclamp submodule refs back.
Merge branch 'master' into hadoop-os-build
Merge branch 'master' into hadoop-os-build
Add updated submodule references for hadoop-os-build
Merge pull request #1485 from galthaus/pull-req-hadoop-os-build-4fe3ac8603

Merge rails3anddb into development [29/29]
Merge branch 'master' into hadoop-os-build