catchup with cockpit (pilot really)

This commit is contained in:
Joe Walker 2011-01-12 01:15:13 +00:00
commit ce503c7470

@ -1 +1 @@
Subproject commit 3c5401f5bc5cd9ffbbf8ebc1e45ecfa39ee898ba
Subproject commit e8c6677e969f8a87ba28ae3405471ab6f9cf83e4