xterm: Changes to 'ubuntu'

[Robert Hooker <sarvatt-guest@alioth.debian.org>]

New branch 'ubuntu' available with the following commits:
commit 5c1935e221020d53f6f6345c10ce472350665060
Author: Robert Hooker <sarvatt@ubuntu.com>
Date:   Thu Jun 10 22:40:51 2010 -0400

    debian/gbp.conf: Update for the ubuntu branch.

commit 9acde7aa19262d4711c00b305ea80969b71dd88b
Author: Robert Hooker <sarvatt@ubuntu.com>
Date:   Thu Jun 10 22:39:47 2010 -0400

    Update changelog.

commit a65376bfafd13175f40f3ded3ed3f8a44b7146f1
Merge: 8f2497c4545efbf014e2a6233a29ffe933b72b7c 52bb9b6bfb634ce0aed2d5370b57e028535621a2
Author: Robert Hooker <sarvatt@ubuntu.com>
Date:   Thu Jun 10 22:18:54 2010 -0400

    Merge commit 'xterm-259-1' into ubuntu
    
    Conflicts:
    	debian/changelog

commit 8f2497c4545efbf014e2a6233a29ffe933b72b7c
Author: Robert Hooker <sarvatt@ubuntu.com>
Date:   Thu Jun 10 22:06:51 2010 -0400

    Imported xterm 256-1ubuntu1