Cherry picked from commit 4cecf6d401a01d054afc1e5f605bcbfe553cb9b9: Applies cleanly to Maverick and Natty
Cherry picked from commit 4cecf6d401a01d0 54afc1e5f605bcb fe553cb9b9:
Applies cleanly to Maverick and Natty