Merge with other build fixes.

This commit is contained in:
Josh Matthews 2012-08-24 12:14:24 -07:00
commit df8919f0a7

@ -1 +1 @@
Subproject commit 71078d8f423474991ff441647dd101a7e690535b
Subproject commit 372c9e36db75100c4d8ef611687322d78d134e3d