fixing some order stuff for ubuntu 10.04

Exactly, the bug has been fixed. Rebasing might not be necessary, as you're only touching one file. If you like, rebasing on current master won't hurt.