This commit looks a bit crazy at first glance. It (re-)introduces lots
of whitespaces and bad formatting.

Explanation: Backporting upstream changes lead to commits being
applied out of order. This meant a lot of manual intervention which in
turn lead to slight differences between upstream and NX.

With this commit these slight differences are minimized which will be
of great help when adding further upstream patches.

 This has already been started while replacing copyright info in file
 headers and has now been completed with this commit.

Summary: Imported nx-X11-3.1.0-1.tar.gz
Keywords:

Imported nx-X11-3.1.0-1.tar.gz
into Git repository