C'mon, do we need athena to handle --help and --version? This
involves a lot of unnecessary initialization, like connecting to
the X server, just to exit(). Handling them in main() makes the
code less uniform, but more efficient (I like to be able to
"civclient --help" when I'm not in X, for example).

In case anyone agrees, patch follows.

[]s,
                                               |alo
                                               +----
--
      I am Lalo of deB-org. You will be freed.
                 Resistance is futile.

http://www.webcom.com/lalo      mailto:lalo@xxxxxxxxxx
                 pgp key in the web page

Debian GNU/Linux       --        http://www.debian.org