xorg: Changes to 'ubuntu-failsafex-extraction'

[Bryce Harrington <bryce-guest@alioth.debian.org>]

New branch 'ubuntu-failsafex-extraction' available with the following commits:
commit 1c5870fb9d2ca18525b23f218645af64ef38f87c
Author: Bryce Harrington <bryce@bryceharrington.org>
Date:   Wed May 18 03:51:53 2011 +0200

    Re-remove apport hook

commit 1a9f8f7d47e27a11218770ad947d055f1c7679c1
Merge: a6b6833 52f6e85
Author: Bryce Harrington <bryce@bryceharrington.org>
Date:   Wed May 18 03:51:32 2011 +0200

    Merge branch 'ubuntu' of ssh://git.debian.org/git/pkg-xorg/debian/xorg into ubuntu
    
    Conflicts:
    	debian/apport/source_xorg.py

commit a6b68336823c27949f36f67ea2c4ce45c9dddd52
Author: Bryce Harrington <bryce@bryceharrington.org>
Date:   Wed May 18 03:24:52 2011 +0200

    Update packaging to reflect removal of failsafe-x

commit 4c236a1891cfd90442572a59000c64e29402e5b9
Author: Bryce Harrington <bryce@bryceharrington.org>
Date:   Wed May 18 03:24:10 2011 +0200

    Migrate the failsafe-x bits out of xorg to xdiagnose