Comment 40 for bug 869652

i've merged John's patch with some modifications (in part to make it apply cleanly against trunk, in part to alter the strings and some of the logic) and also added code to remove the "Current Screen" option when there is only one screen on the system. i will commit once 4.6 is open since we are currently in string freeze and this change contains a new string.

i will credit both John and tmartsum in the commit message. cheers!

@Jens: when you say "your patch", do you mean tmartsum's or John's?