[master] a95a36f Merge branch 'master' of ssh://git.varnish-cache.org/git/varnish-cache

[Per Andreas Buer]

commit a95a36f77713c8c91bef491f9136b4fe57ae5500
Merge: 40e2168 f214deb
Author: Per Buer <perbu at varnish-software.com>
Date:   Wed Jan 26 12:51:43 2011 +0100

    Merge branch 'master' of ssh://git.varnish-cache.org/git/varnish-cache
    
    Conflicts:
    	doc/sphinx/reference/varnishncsa.rst

diff --cc doc/sphinx/reference/varnishncsa.rst
index 13fc82a,9c7a012..0500d96
--- a/doc/sphinx/reference/varnishncsa.rst
+++ b/doc/sphinx/reference/varnishncsa.rst
@@@ -15,10 -15,10 +15,11 @@@ Display Varnish logs in Apache / NCSA c
  SYNOPSIS
  ========
  
 -varnishncsa [-a] [-b] [-C] [-c] [-D] [-d] [-f] [-I regex] 
 -[-i tag] [-n varnish_name] [-o tag regex] [-P file] [-r file] [-V] 
 -[-w file] [-X regex] [-x tag]
 +varnishncsa [-a] [-b] [-C] [-c] [-D] [-d] [-f] [-F format] [-I regex]
 +[-i tag] [-n varnish_name] [-P file] [-r file] [-V] [-w file] 
 +[-X regex] [-x tag]
 +
+ 
  DESCRIPTION
  ===========