am fa6ef56a: Apply changes to migrate to upstream (Nov 25th 2011).

* commit 'fa6ef56a6ca3dc3061218a75a7e68e5357fcb82c':
  Apply changes to migrate to upstream (Nov 25th 2011).