catchup with cockpit

This commit is contained in:
Joe Walker 2011-01-07 12:20:09 +00:00
commit 5a74d8f944

@ -1 +1 @@
Subproject commit 308e347893b9ed0645b46aa3f31d1d4fb5205fcc
Subproject commit 3c5401f5bc5cd9ffbbf8ebc1e45ecfa39ee898ba