Bug 973405 - Move some misc LOCAL_INCLUDES to moz.build; r=glandium
Bug 973658 - Actually revert the value of the Permanent Private Browsing pref when the user presses Cancel in response to the restart dialog; r=jdm

Before we were implicitly relying on the pref being reverted through
the checkbox, but that won't happen if the checkbox was never clicked
by the user.