Rev 1918: Merge trunk. in file:///data/jelmer/bzr-svn/trunk/

[Jelmer Vernooij]

At file:///data/jelmer/bzr-svn/trunk/

------------------------------------------------------------
revno: 1918
revision-id: jelmer at samba.org-20080928202404-k7f4s0wmwe0vrrvj
parent: jelmer at samba.org-20080928201625-2bumgl48eac53dll
parent: jelmer at samba.org-20080923165754-bi7gi0ov4vaxyoh6
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Sun 2008-09-28 22:24:04 +0200
message:
  Merge trunk.
    ------------------------------------------------------------
    revno: 1915.1.1
    revision-id: jelmer at samba.org-20080923165754-bi7gi0ov4vaxyoh6
    parent: jelmer at samba.org-20080921135104-x10559n0jryl35es
    parent: jelmer at samba.org-20080923165728-7568c2gayb0rexnr
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: trunk
    timestamp: Tue 2008-09-23 18:57:54 +0200
    message:
      Merge 0.4.
    modified:
      AUTHORS                        AUTHORS-20060508114718-4c90c0062645106d
      FAQ                            faq-20070910195147-p9u38s9wplds2d4o-1
      ra.c                           ra.pyx-20080313140933-qybkqaxe3m4mcll7-1
      setup.py                       setup.py-20060502115218-86950492da22353f