Merge remote-tracking branch 'origin/patches-2.0' Conflict in buffer.c: the new file-segment logic conflicted with the solaris sendfile fix.
2011-08-17T22:08:06