[patch] stephen's staging headers patch

[Benjamin Kosnik]

> This section is missing the few logic changes made since the 3.0 release:

Ack. I kind of faked that part, and you caught me. 

Can you post a patch that does this part correctly?

thanks,
benjamin