Backported from X.Org:

   commit 1cfa9f647e0241f4b9e56556b128d7bfd987eaca
   Author: Daniel Stone <daniel@fooishbar.org>
   Date:   Tue Feb 28 16:55:26 2006 +0000

   Bug # 5216: Allow options to appear with other components.
Backported-to-NX-by: Ulrich Sibiller <uli42@gmx.de>