Merge remote-tracking branch 'afaerber/cocoa-for-upstream' into staging
commit8aceefd77c2bb5af02759d11eb836c42ad9e720d
authorAnthony Liguori <aliguori@us.ibm.com>
Tue, 1 Nov 2011 22:29:24 +0000 (1 17:29 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Tue, 1 Nov 2011 22:29:24 +0000 (1 17:29 -0500)
tree06eef615cd364695d19e568a5f3029911a1298fe
parentef26ee0e6c67d415f8b22850f9f13a972ada8be1
parent13766eb1e46452affd12f2b944730e136c6a2dda
Merge remote-tracking branch 'afaerber/cocoa-for-upstream' into staging