]> git.ipfire.org Git - thirdparty/squid.git/log
thirdparty/squid.git
16 years agoMerge object invalidation changes.
Benno Rice [Thu, 4 Sep 2008 06:05:53 +0000 (16:05 +1000)] 
Merge object invalidation changes.

- Change default invalidation behaviour to match recommended behaviour in RFC.
- Ensure URLs from Location and Content-Location headers are absolute before
  trying to find their associated objects in the store.

16 years agoMerge from upstream.
Benno Rice [Thu, 4 Sep 2008 06:03:40 +0000 (16:03 +1000)] 
Merge from upstream.

16 years agoAuthor: Marin Stavrev <mstavrev@gmail.com>
Amos Jeffries [Thu, 4 Sep 2008 04:33:48 +0000 (16:33 +1200)] 
Author: Marin Stavrev <mstavrev@gmail.com>
Fix bug in ZPH parent/sibling hit marking.

When a peer (parent or sibling) hit was detected the TOS was changed using
the local hit TOS marking (zph_tos_local) value instead of the one
configured in the zph_tos_peer parameter.

16 years agoImport windows support notes from 2.7
Amos Jeffries [Thu, 4 Sep 2008 03:11:27 +0000 (15:11 +1200)] 
Import windows support notes from 2.7

16 years agoPreserve TPROXY socket properties across a reset
Amos Jeffries [Wed, 3 Sep 2008 10:39:15 +0000 (22:39 +1200)] 
Preserve TPROXY socket properties across a reset

16 years agoAddress Alex and Amos' comments.
Benno Rice [Wed, 3 Sep 2008 04:42:27 +0000 (14:42 +1000)] 
Address Alex and Amos' comments.

- Also mention the responsibility of the caller to free the result of
  urlMakeAbsolute in the non-NULL case.

16 years agoAddress Alex's comments.
Benno Rice [Wed, 3 Sep 2008 04:40:31 +0000 (14:40 +1000)] 
Address Alex's comments.

- Use bool instead of int for urlIsRelative.
- Document what leads to a NULL return in urlMakeAbsolute.
- Declare variables closer to where they're used.
- Fix indentation.

16 years agoFurther cleanup of urlAbsolute and friends.
Benno Rice [Wed, 3 Sep 2008 01:00:39 +0000 (11:00 +1000)] 
Further cleanup of urlAbsolute and friends.

- Split urlAbsolute into urlIsRelative and urlMakeAbsolute.
- Make urlIsRelative compliant with the RFC as to what defines a relative URL.
- Rework purgeEntriesByHeader to be a little easier on the eyes.

16 years agoFixed.
Benno Rice [Tue, 2 Sep 2008 11:45:48 +0000 (21:45 +1000)] 
Fixed.

16 years agoCheckpoint. Broken.
Benno Rice [Tue, 2 Sep 2008 11:27:02 +0000 (21:27 +1000)] 
Checkpoint.  Broken.

16 years agoUse xmalloc rather than xstrdup.
Benno Rice [Tue, 2 Sep 2008 09:57:18 +0000 (19:57 +1000)] 
Use xmalloc rather than xstrdup.

16 years agoRework urlAbsolute to be a little more streamlined.
Benno Rice [Mon, 1 Sep 2008 02:36:52 +0000 (12:36 +1000)] 
Rework urlAbsolute to be a little more streamlined.

The primary aim of this is to cut down on the number of ways snprintf was
called in the original version.  The idea here is to build the common base
portion of the url using snprintf and then construct the rest using str[n]cpy.
snprintf is still used as the alternative (using only POSIX routines) involves
a much longer run of code that, at least in my estimation, gains us very little
over snprintf.

16 years agoWhitespace fixage.
Benno Rice [Fri, 29 Aug 2008 04:35:42 +0000 (14:35 +1000)] 
Whitespace fixage.

16 years ago- Use safe_free instead of xfree.
Benno Rice [Fri, 29 Aug 2008 01:02:18 +0000 (11:02 +1000)] 
- Use safe_free instead of xfree.
- Minor optimisation.

16 years agoMention actual RFC text here.
Benno Rice [Fri, 29 Aug 2008 00:56:35 +0000 (10:56 +1000)] 
Mention actual RFC text here.

16 years agoMerge from upstream.
Benno Rice [Fri, 29 Aug 2008 00:32:17 +0000 (10:32 +1000)] 
Merge from upstream.

16 years agoLanguages: Dutch Translation
Amos Jeffries [Thu, 28 Aug 2008 12:57:15 +0000 (00:57 +1200)] 
Languages: Dutch Translation

16 years agoRFC-compliant object invalidation behaviour.
benno@jeamland.net [Thu, 28 Aug 2008 05:12:17 +0000 (15:12 +1000)] 
RFC-compliant object invalidation behaviour.

- Switch the default from not purging if the method is unknown to purging if
  the method is unknown.
- When purging URIs sourced from Location and Content-Location headers, make
  sure the URL is absolute before a) comparing it to see if hosts match and b)
  actually trying to find it in the store.

16 years agoMerge from upstream.
benno@jeamland.net [Thu, 28 Aug 2008 05:05:01 +0000 (15:05 +1000)] 
Merge from upstream.

16 years agoAuthor: Benno Rice <benno@squid-cache.org>
Amos Jeffries [Wed, 27 Aug 2008 13:01:36 +0000 (01:01 +1200)] 
Author: Benno Rice <benno@squid-cache.org>
Respect $(MAKE) in error translation build.

On FreeBSD, make is not GNU make.  GNU make can be installed from ports, but it
is installed as gmake, not make.  This makes it vital that Makefiles that wish
to work on FreeBSD always invoke make with $(MAKE) instead of make.  The recent
error translation stuff did not follow this, and thus the build broke on
FreeBSD.

16 years agoFix build on systems where $(MAKE) != make
Benno Rice [Wed, 27 Aug 2008 05:33:36 +0000 (15:33 +1000)] 
Fix build on systems where $(MAKE) != make

16 years agoDon't change that.
Benno Rice [Wed, 27 Aug 2008 05:30:08 +0000 (15:30 +1000)] 
Don't change that.

16 years agoMerge from upstream, fix build.
Benno Rice [Wed, 27 Aug 2008 05:28:33 +0000 (15:28 +1000)] 
Merge from upstream, fix build.

16 years agoAuthor: Francesco Chemolli <kinkie@squid-cache.org>
Amos Jeffries [Mon, 25 Aug 2008 13:40:16 +0000 (01:40 +1200)] 
Author: Francesco Chemolli <kinkie@squid-cache.org>
TestBed: Fix layer-01 permutation options

This patch addresses three related issues:
- makes the error messages for those cases more informative
- changes some (echo + exit) sequences into AC_MSG_ERROR() standard autoconf macros
- changes the layer-01 test options so that it doesn't invoke invalid configure options

16 years agoAuthor: Francesco Chemolli <kinkie@squid-cache.org>
Amos Jeffries [Mon, 25 Aug 2008 12:30:24 +0000 (00:30 +1200)] 
Author: Francesco Chemolli <kinkie@squid-cache.org>
Fix bad pattern in squid.conf cleanup

This time it should work by avoiding the Makefile quoting issue entirely:

  grep -v -E '^$'
is in fact equivalent to
  grep .

Hand-comparing the results seems to be ok

16 years agoclean(er) squid.conf
Amos Jeffries [Sat, 23 Aug 2008 04:40:50 +0000 (16:40 +1200)] 
clean(er) squid.conf

* Adds squid.conf.documented as the full commented config file
* Prunes all documentation out of the basic squid.conf.default

16 years agoQuieten overly verbose build testing
Amos Jeffries [Sat, 23 Aug 2008 03:43:59 +0000 (15:43 +1200)] 
Quieten overly verbose build testing

* silences script debug per-action details
* silences unneeded configure output down to errors-only
* diverts automake error output into logs

16 years agoAuthor: Francesco Chemolli <kinkie@squid-cache.org>
Amos Jeffries [Sat, 23 Aug 2008 03:39:18 +0000 (15:39 +1200)] 
Author: Francesco Chemolli <kinkie@squid-cache.org>
Fixed typo in squid.h which would prevent leak checking for arrays.

16 years agoDrop obsolete Danish files
Amos Jeffries [Fri, 22 Aug 2008 13:07:36 +0000 (01:07 +1200)] 
Drop obsolete Danish files

16 years agoLanguages: Danish Translation
Amos Jeffries [Fri, 22 Aug 2008 13:00:18 +0000 (01:00 +1200)] 
Languages: Danish Translation

17 years agoBug 2340: make install errors, uudecode, gif-files
Amos Jeffries [Tue, 19 Aug 2008 08:37:32 +0000 (20:37 +1200)] 
Bug 2340: make install errors, uudecode, gif-files

Removes dynamic generation of static files and VCS distributes them
directly.

17 years agoAttribute French+Catalan translation to the original creators
Amos Jeffries [Sun, 17 Aug 2008 08:15:07 +0000 (20:15 +1200)] 
Attribute French+Catalan translation to the original creators

17 years agoLanguages: Catalan Translation
Amos Jeffries [Sun, 17 Aug 2008 08:04:04 +0000 (20:04 +1200)] 
Languages: Catalan Translation

17 years agoDrop obsolete Catalan files
Amos Jeffries [Sun, 17 Aug 2008 08:03:00 +0000 (20:03 +1200)] 
Drop obsolete Catalan files

17 years agoLanguages: Catalan Translation
Amos Jeffries [Sun, 17 Aug 2008 08:00:15 +0000 (20:00 +1200)] 
Languages: Catalan Translation

17 years agoLanguage Updates
Amos Jeffries [Sun, 17 Aug 2008 05:57:50 +0000 (17:57 +1200)] 
Language Updates

17 years agoMerge from trunk
Amos Jeffries [Sun, 17 Aug 2008 05:56:41 +0000 (17:56 +1200)] 
Merge from trunk

17 years agoDrop obsolete French files
Amos Jeffries [Sun, 17 Aug 2008 05:49:09 +0000 (17:49 +1200)] 
Drop obsolete French files

17 years agoLanguages: French Translation
Amos Jeffries [Sun, 17 Aug 2008 05:47:01 +0000 (17:47 +1200)] 
Languages: French Translation

17 years agoDrop obsolete French files
Amos Jeffries [Sun, 17 Aug 2008 05:43:34 +0000 (17:43 +1200)] 
Drop obsolete French files

17 years agoLanguages: French Translation
Amos Jeffries [Sun, 17 Aug 2008 05:40:59 +0000 (17:40 +1200)] 
Languages: French Translation

17 years agoMoving snapshots to squidm
Automatic source maintenance [Sat, 16 Aug 2008 09:45:48 +0000 (03:45 -0600)] 
Moving snapshots to squidm

17 years agoTestBed: merge .flags into .opts file
Amos Jeffries [Fri, 15 Aug 2008 10:50:34 +0000 (22:50 +1200)] 
TestBed: merge .flags into .opts file

17 years agoBug #2437: peer name not logged in access.log like expected, instead the ip address...
Henrik Nordstrom [Thu, 14 Aug 2008 19:28:51 +0000 (21:28 +0200)] 
Bug #2437: peer name not logged in access.log like expected, instead the ip address is logged

The hierarchy field in access.log should log the peer name, not the hostname/ipaddress.

This is a regression from 2.6.

17 years agoCleanup ip based acl parser to be more explicit about what it does and properly detec...
Henrik Nordstrom [Wed, 13 Aug 2008 14:49:32 +0000 (16:49 +0200)] 
Cleanup ip based acl parser to be more explicit about what it does and properly detect malformed addresses

17 years agoSwitch getaddrinfo to use inet_pton and verify the result to detect malformed/bad...
Henrik Nordstrom [Wed, 13 Aug 2008 14:48:26 +0000 (16:48 +0200)] 
Switch getaddrinfo to use inet_pton and verify the result to detect malformed/bad IP addresses

17 years agoMake .POT updater cleanup after itself
Amos Jeffries [Wed, 13 Aug 2008 10:22:25 +0000 (22:22 +1200)] 
Make .POT updater cleanup after itself

17 years agoAdd es to auto-translations
Amos Jeffries [Wed, 13 Aug 2008 08:33:06 +0000 (20:33 +1200)] 
Add es to auto-translations

17 years agoLanguages: Spanish Translation
Amos Jeffries [Wed, 13 Aug 2008 08:16:38 +0000 (20:16 +1200)] 
Languages: Spanish Translation

17 years agoLanguages: Spanish Translation
Amos Jeffries [Wed, 13 Aug 2008 08:15:53 +0000 (20:15 +1200)] 
Languages: Spanish Translation

17 years agoMerged from trunk
Amos Jeffries [Wed, 13 Aug 2008 08:11:12 +0000 (20:11 +1200)] 
Merged from trunk

17 years agoSync content from Rosetta
Amos Jeffries [Wed, 13 Aug 2008 08:10:34 +0000 (20:10 +1200)] 
Sync content from Rosetta

17 years agoWindows port: Silence some harmless GCC warnings/errors
Henrik Nordstrom [Wed, 13 Aug 2008 03:27:35 +0000 (05:27 +0200)] 
Windows port: Silence some harmless GCC warnings/errors

17 years agoShield netdb.h include. Not available on all platforms (Windows)
Henrik Nordstrom [Wed, 13 Aug 2008 03:24:57 +0000 (05:24 +0200)] 
Shield netdb.h include. Not available on all platforms (Windows)

17 years agoCorrect parsing of ip/mask. Was being parsed as ip-255.255.255.255/mask
Henrik Nordstrom [Wed, 13 Aug 2008 03:22:54 +0000 (05:22 +0200)] 
Correct parsing of ip/mask. Was being parsed as ip-255.255.255.255/mask

17 years agoGCC 4.3 changed semantics of "extern inline" to that of C99 (same as inline),
Henrik Nordstrom [Wed, 13 Aug 2008 03:19:05 +0000 (05:19 +0200)] 
GCC 4.3 changed semantics of "extern inline" to that of C99 (same as inline),
but we assume GNU GCC semantics. This sets the needed attribute to tell GCC
to continue using GNU GCC semantics on this function.

17 years agoPolish translation mechanism
Amos Jeffries [Tue, 12 Aug 2008 12:59:50 +0000 (00:59 +1200)] 
Polish translation mechanism

Adds an automatic test for po2html binary and only attempts translation
if one is located.
The po2html path can be specified using: --with-po2html=/path/po2html

17 years agoTestBed: remove another bashism
Amos Jeffries [Tue, 12 Aug 2008 12:25:41 +0000 (00:25 +1200)] 
TestBed: remove another bashism

17 years agoAuthor: Francesco Salvestrini and Dustin J. Mitchell
Amos Jeffries [Tue, 12 Aug 2008 12:12:37 +0000 (00:12 +1200)] 
Author: Francesco Salvestrini and Dustin J. Mitchell
Extend configure with ax_with_prog

Locates an installed program binary, placing the result in the precious
variable VARIABLE. Accepts a present VARIABLE, then --with-program, and
failing that searches for program in the given path (which defaults to
the system path). If program is found, VARIABLE is set to the full path
of the binary; if it is not found VARIABLE is set to VALUE-IF-NOT-FOUND
if provided, unchanged otherwise.

NOTE: This macro is based upon the original AX_WITH_PYTHON macro from
      Dustin J. Mitchell <dustin@cs.uchicago.edu>.

COPYLEFT
   Copyright (c) 2008 Francesco Salvestrini <salvestrini@users.sourceforge.net>
   Copyright (c) 2008 Dustin J. Mitchell <dustin@cs.uchicago.edu>

17 years agoTestBed: Remove another bashism
Amos Jeffries [Tue, 12 Aug 2008 11:10:59 +0000 (23:10 +1200)] 
TestBed: Remove another bashism

17 years agoAuthor: Dmitry Kurochkin
Amos Jeffries [Sun, 10 Aug 2008 12:45:41 +0000 (00:45 +1200)] 
Author: Dmitry Kurochkin
Bug: 23512: no_check.pl ntlm helper never sends challenge

17 years agoUpdates auto-save
Amos Jeffries [Sun, 10 Aug 2008 06:00:46 +0000 (18:00 +1200)] 
Updates auto-save

17 years agoFix: cppunit tests broken by squid.h defines
Amos Jeffries [Sun, 10 Aug 2008 05:49:14 +0000 (23:49 -0600)] 
Fix: cppunit tests broken by squid.h defines

In order to promote safe coding and the use of internal accounting API
Squid mangles certain common function definitions such as malloc/calloc.

While this is a great idea for Squid internal code. It's not good when
integrating external cppunit macro libraries. At least one of which in
use performs its own allocation during testing.

This adds an extra layer of protection to prevent redirection with certain
unit-tests where the macros needed clash with Squid.

17 years agoCompile error
Amos Jeffries [Sun, 10 Aug 2008 05:05:45 +0000 (17:05 +1200)] 
Compile error

Auto-testing located.

17 years agoUpdates auto-save
Amos Jeffries [Sun, 10 Aug 2008 00:00:24 +0000 (12:00 +1200)] 
Updates auto-save

17 years agoTestBed: Layer 01 - Minimal build
Amos Jeffries [Sat, 9 Aug 2008 13:54:43 +0000 (01:54 +1200)] 
TestBed: Layer 01 - Minimal build

Automated testing of minimal build squid. This level disables all
features and options that may be disabled.

Squid must be expected to build cleanly with optional code disabled.

17 years agoTestBed: continue testing even if make distclean fails
Amos Jeffries [Sat, 9 Aug 2008 06:46:59 +0000 (18:46 +1200)] 
TestBed: continue testing even if make distclean fails

17 years agoBug 2379: obsolete dns_testnames option
Amos Jeffries [Sat, 9 Aug 2008 06:24:33 +0000 (18:24 +1200)] 
Bug 2379: obsolete dns_testnames option

Removes the dns_testnames squid.conf option and all related code.

Obsoletes -D command line option which existed only for the purpose of
turning dns_testnames off. Scheduled for absolute removal in Squid
3.2. But should be assumed as non-existing from 3.1 onwards.

17 years agoError page auto-negotiation.
Amos Jeffries [Sat, 9 Aug 2008 05:59:55 +0000 (17:59 +1200)] 
Error page auto-negotiation.

  * Converts error_directory squid.conf option into an optional override.
    Providing backward compatibility with older configurations and local
    customizations.

  * Adds error_default_language to administratively set the backup
    language presented by Squid.

  * Fixes design of previously broken hard-coded failover language.
    WAS: default to FreeBSD error install location. Hidden by
         error_directory being required.
    NOW: failover to build-time configured errors/ directory 'English'
         templates.

  * Adds --enable-auto-locale configure option to enable the following.

  * Adds logic to locate visitors most-preferred of available languages
    and present a tailored error page as their reply.

17 years agoFix some non-ascii characters causing editor problems
Amos Jeffries [Sat, 9 Aug 2008 05:04:20 +0000 (17:04 +1200)] 
Fix some non-ascii characters causing editor problems

17 years agoDrop old lagnuages from makefile
Amos Jeffries [Sat, 9 Aug 2008 04:25:05 +0000 (22:25 -0600)] 
Drop old lagnuages from makefile

17 years agoall target needs protecting from absent translation
Amos Jeffries [Fri, 8 Aug 2008 17:45:04 +0000 (05:45 +1200)] 
all target needs protecting from absent translation

17 years agoUpdates auto-save
Amos Jeffries [Fri, 8 Aug 2008 12:00:28 +0000 (00:00 +1200)] 
Updates auto-save

17 years agoLanguage Updates
Amos Jeffries [Fri, 8 Aug 2008 08:10:34 +0000 (20:10 +1200)] 
Language Updates

17 years agoDrop remainder from bzr bug testing earlier.
Amos Jeffries [Fri, 8 Aug 2008 08:08:27 +0000 (20:08 +1200)] 
Drop remainder from bzr bug testing earlier.

17 years agoMerge from trunk
Amos Jeffries [Fri, 8 Aug 2008 08:07:10 +0000 (20:07 +1200)] 
Merge from trunk

17 years agoPreserve old translators details
Amos Jeffries [Fri, 8 Aug 2008 07:55:02 +0000 (19:55 +1200)] 
Preserve old translators details

We are going to remove the old translations as they are upgraded.
But its probably worth keeping the record of who worked on them as the
new work may be derived information.

17 years agoFix shell issue on translation output
Amos Jeffries [Fri, 8 Aug 2008 07:30:09 +0000 (19:30 +1200)] 
Fix shell issue on translation output

Seems not only does sed on BSD use different regexp parameters but has a
different pattern set as well. The output HTML may look nasty without
cleaning but if the cleaning goes badly it can make the visual end-product
look worse. In this case spurious 'n' characters around the page.

Dropping the sed-based cleanup entirely in favor of usable pages.

17 years agoDrop old translations
Amos Jeffries [Fri, 8 Aug 2008 07:14:00 +0000 (19:14 +1200)] 
Drop old translations

English, German, Italian are now auto-translated and the old versions
are not needed to be stored in bzr.

17 years agoUpdates auto-save
Amos Jeffries [Thu, 7 Aug 2008 06:00:43 +0000 (18:00 +1200)] 
Updates auto-save

17 years agoFix snapshots
Amos Jeffries [Thu, 7 Aug 2008 01:55:42 +0000 (19:55 -0600)] 
Fix snapshots

 - FreeBSD version of sed installed on squid-cache does
  not provide the -r option, uses -E instead

 - shuffles the dist target specific actions all back into dist-hook
   so as to not interfere or fail on manual translations runs.

17 years agobzr test 2 pt 2
Amos Jeffries [Thu, 7 Aug 2008 00:16:54 +0000 (12:16 +1200)] 
bzr test 2 pt 2

17 years agotest bzr 2
Amos Jeffries [Thu, 7 Aug 2008 00:14:44 +0000 (12:14 +1200)] 
test bzr 2

17 years agotest bzr 2
Amos Jeffries [Thu, 7 Aug 2008 00:13:40 +0000 (12:13 +1200)] 
test bzr 2

17 years agomerged from trunk
Amos Jeffries [Thu, 7 Aug 2008 00:05:31 +0000 (12:05 +1200)] 
merged from trunk

17 years agotest bzr pt2
Amos Jeffries [Thu, 7 Aug 2008 00:02:58 +0000 (12:02 +1200)] 
test bzr pt2

17 years agotest bzr
Amos Jeffries [Thu, 7 Aug 2008 00:01:59 +0000 (12:01 +1200)] 
test bzr

17 years agotest bzr
Amos Jeffries [Thu, 7 Aug 2008 00:00:07 +0000 (12:00 +1200)] 
test bzr

17 years agoMerged from trunk
Amos Jeffries [Wed, 6 Aug 2008 23:55:29 +0000 (11:55 +1200)] 
Merged from trunk

17 years agoLanguages: Brazillian Portuguese Translation
Amos Jeffries [Wed, 6 Aug 2008 23:50:01 +0000 (11:50 +1200)] 
Languages: Brazillian Portuguese Translation

17 years agoLanguages: Brazillian Portuguese Translation
Amos Jeffries [Wed, 6 Aug 2008 23:39:12 +0000 (11:39 +1200)] 
Languages: Brazillian Portuguese Translation

17 years agoMerged from trunk
Amos Jeffries [Wed, 6 Aug 2008 23:32:07 +0000 (11:32 +1200)] 
Merged from trunk

17 years agoUpdates auto-save
Amos Jeffries [Wed, 6 Aug 2008 18:01:07 +0000 (06:01 +1200)] 
Updates auto-save

17 years agotypo
Amos Jeffries [Wed, 6 Aug 2008 14:41:47 +0000 (02:41 +1200)] 
typo

17 years agoAuthor: Markus <huaraz@moeller.plus.com>
Amos Jeffries [Wed, 6 Aug 2008 12:51:15 +0000 (00:51 +1200)] 
Author: Markus <huaraz@moeller.plus.com>
Bug 2426: Increase buffer in authenticateNegotiateStart / squid_kerb_auth

- Kerberos helper bit left out of first patch.

17 years agoFix: translate stalls with no-such-dir
Amos Jeffries [Wed, 6 Aug 2008 11:35:37 +0000 (23:35 +1200)] 
Fix: translate stalls with no-such-dir

17 years agoLanguages: set current .po for distribution
Amos Jeffries [Wed, 6 Aug 2008 10:18:03 +0000 (22:18 +1200)] 
Languages: set current .po for distribution

17 years agoAppend squid signature to tempates for translation
Amos Jeffries [Wed, 6 Aug 2008 10:12:37 +0000 (22:12 +1200)] 
Append squid signature to tempates for translation

- Appends the squid signature to each template.
  The .PO to html conversion was closing each page off anyway
- Updates dictionary and .PO to new text.
- signature is bound by a "footer" class object for display disabling if
  needed.

17 years agoDistribute new languages
Amos Jeffries [Tue, 5 Aug 2008 13:29:56 +0000 (01:29 +1200)] 
Distribute new languages

17 years agoMerged from trunk
Amos Jeffries [Tue, 5 Aug 2008 13:29:03 +0000 (01:29 +1200)] 
Merged from trunk