===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/plus.html,v
retrieving revision 1.1196
retrieving revision 1.1197
diff -c -r1.1196 -r1.1197
*** www/plus.html 2011/06/17 18:59:36 1.1196
--- www/plus.html 2011/07/20 17:07:24 1.1197
***************
*** 68,73 ****
--- 68,386 ----
+
+ - Fixed client and group cycle defines in cwm(1).
+
- Disable pipex for L2TP on disconnect.
+
- Unified various macppc gpio(4) access methods that take an offset relative to the mac-io bus base address. Needed by upcoming dfs(4/MACPPC) support.
+
- Make ssh(1) use FD_CLOEXEC consistently.
+
+
- Fixed arguments to arm pmap(9) pool_init: alignment of alignment of L2_TABLE_SIZE_REAL is at offset 0 and not at offset L2_TABLE_SIZE_REAL.
+
- Make pci(4) pass flags down the PCI bus hierarchy.
+
- Fixed type warnings reported by clang in smtpd(8).
+
- Added pci(4) register definitions for PCI MSI capability.
+
- Fixed wrong id for UDP_ENCAP_TRANSPORT_DRAFT in isakmpd(8).
+
+
- Make ssh(1) warn on unexpected key type in key_parse_private_type().
+
+
- Make calls to malloc(3) malloc_dump() safer by avoiding file pointer computation for stats.
+
- Fixed some warnings in adduser(8).
+
- Introduced leak detection code for MALLOC_STATS in malloc(3).
+
+
- Fixed bug in glob(3).
+
- Make dhclient(8) more friendly to sequential option processing by always starting DHCP packet options with DHO_DHCP_MESSAGE_TYPE. Improved working with Nortel NetIP DHCP server.
+
- Cleaned up adduser(8) handling of email messages.
+
- Pre-allocate memory in ipsec(4) package to avoid sleeping after performing a lookup, which may lead to a race.
+
- Removed support for authorized_keys2, a relic from the early days of protocol V2, in ssh(1).
+
+
- Stop leaking swapslots in uvm(9) when doing a uvm_km_pgremove and a page is in swap only.
+
- Removed uvm(9) vm_page_lookup_freelist().
+
- Prevent security(8) from complaining about a group(5) line with a single "+" as "wrong number of fields", that abbreviated syntax for NIS map of groups is explicitly allowed by group(5). Warn if this isn't the last line of group(5) though.
+
- Fixed an off-by-one that made smtpd(8) skip an "invalid" bucket that was actually valid.
+
- Implemented correct prologue and epilogue for hppa64 machine-dependent init.
+
- Make mips common kernel code set octeon's internal counter clock speed to its processor clock.
+
- Fixed aucat(1) option handling and enable TCP in midicat(1).
+
- Make more silent ssh(1) debug() logs by detecting that it's trying to load a private key in key_try_load_public() and returning early.
+
- Make pfsync(4) use timeout(9) timeout_del return value to check if the timeout is actually removed when undeferring a packet.
+
- Make timeout(9) timeout_del able to tell the caller if it actually did remove a timeout or not.
+
+
- Refactored queue allocation and initialization into wdc(4) wdc_alloc_queue() function, and let attachment code call this rather than malloc(9). This prevents re-initialization of the queue in shared queue chipsets.
+
- Initialize the wdc(4) ata_drive_datas structures earlier in wdcattach() so that chip-specific drv_probe routines can assume they've already been initialized.
+
- Added a wprintf(3) man pages.
+
- Always free the multibyte->wchar conversion buffer allocated in vfwprintf(3) __mbsconv().
+
- Make sndio(7) sio_psleep() use an array of SIO_MAXNFDS pollfd structures rather than a single one.
+
- Initialize the 'pstate' field of the aucat(1) wav structure.
+
- Make gdb(1) handle lazy relocation stubs as Linux does.
+
- Started a work in ospfd(8) to support opaque LSA.
+
- Make relayd(8) use the proc.c privsep API/commodity functions based on work for iked(8) and smtpd(8).
+
- Fixed segfault in smtpd(8) newaliases after global env move.
+
+
- Fixed a few minor issues in i386 hibernate support code relating to improper swap device determination and memory range calculation.
+
- Make tmux(1) reset last pane on break-pane. Fixes a problem reported in Debian bug #622677.
+
- Make tmux(1) reset last pane on swap-pane across windows. Fixes a crash.
+
- Fix memory handling in octeon machine-dependent code.
+
- Prevent tmux(1) from dragging on click, only select.
+
- Fixed memory leaks in tmux(1) command capture pane.
+
- Fixed a memory leak in tmux(1) commands if cmd_pane_session succeed.
+
- Added a new option to tmux(1), mouse-resize-pane which, when on, allows panes to be resized by dragging their borders.
+
- Make tmux(1) use the tsl and fsl terminfo(5) capabilities to update terminal title and automatically fill them in on terminals with the XT capability.
+
- Eliminated a few unused wdc(4) capability flags (WDC_CAPABILITY_HWLOCK, WDC_CAPABILITY_ATA_NOSTREAM, and WDC_CAPABILITY_ATAPI_NOSTREAM).
+
- Added a small memory optimization in fsck_ffs(8).
+
- Improved tmux(1) behaviour when TTY allocation fails: if RequestTTY is set to 'auto' make it not treat a TTY allocation error as fatal and just restore the local TTY.
+
- Fixed xf86-input-ws on xserver 1.9 and earlier.
+
- Make sure sysmerge(8) handle first /etc/group and /etp/master.passwd in case it need to install files or directories with newly added user/group ownerships.
+
- Enabled xf86-input-synaptics on i386 and amd64.
+
- Simplified physio(9) thanks to the fact that buffers now come out of a pool rather than a global list of statically allocated structures and aren't shared.
+
+
- Added support to new wscons(4) ioctl WSMOUSEIO_SETMODE in xf86-input-synaptics.
+
- Introduced a 'freeze' flag in tmux(1) which make it ignore any move or resize requests made on the windows it's applied.
+
- Removed uvm_pglist.h from the tree.
+
- Updated xf86-input-acecad to version 1.5.0, xf86-video-chips to 1.2.4, xf86-video-vmware to 11.0.3, xf86-video-siliconmotion to 1.7.5, xlsclients to 1.1.2.
+
+
- Added a RequestTTY ssh_config(5) option to allow configuration-based control over tty(4) allocation, like ssh [-tT].
+
- Make ssh_config(5) support negated host matching.
+
- Added a %L expansion (short-form of the local host name) for ssh(1) ControlPath.
+
- Set ssh(1) traffic class for IPv6 traffic as it's done for IPv4 TOS. Fixes bz#1855.
+
- On cwm(1) map, prevent it from warping the windows that are marked as ignored.
+
- Make ubsec(4) interrupt routine acknowledge only the interrupts it can process.
+
- Make sure amd64 AES session id checks look at the lower 32 bits of crp_sid.
+
- Make sysmerge(8) create the directory holding the link it's about to create if it does not exist.
+
- Force loopback interfaces to IF_STA_LOOPBACK in ospf6d(8).
+
- Fixed memory leak in ssh(1). Fixes bz#1849.
+
+
- Make hppa64 gateway page accessible to all userland processes.
+
- Put back cwm(1) window resize back to 60 Hz.
+
- Reverted atapiscsi(4) to only attempting on IDENTIFY command against directly attached devices as in the pre-port-multiplier code.
+
- Make the "mute" key work on macppc keyboards.
+
- Make urndis(4) attach to Samsung Galaxy S.
+
- Added disklabel(8) support in tunefs(8).
+
- Make cwm(1) menu window aware of xinerama(3) info.
+
- Keep synaptics touchpad to the current wscons(4) behaviour until WSMOUSEIO_SETMODE ioctl is issued to switch to synaptics mode.
+
- Make sure hppa64 restore sr4 at the very end of locore.S to avoid further loads from the trapframe to be done at the wrong address space.
+
- Make tftp-proxy(8) use 'divert-to'.
+
- Make malloc(3) start scanning the bits of the chunk at a random position to take the first available free slots instead of starting from position zero and skipping a random number of free slots. Make things faster.
+
- Updated relayd(8) logging and debug functions to use the C99 __func__ macro instead of static function names.
+
- Allow a user to specify relayd(8) root priority.
+
- Fixed check of errors in bgpd(8) sessions.
+
- Make ssh(1) gracefully fall back when ControlPath is too large for a sockaddr_un.
+
+
- Make atactl(8) capable of reading disklabel(8) UIDs.
+
- Allow ssh-add(1) to read key from standard input with ssh-add - .
+
- Make iscsid(8) handle logins more correctly.
+
- Make scsi(4) skip leading blanks and collapse multiple white spaces into when when printing scsi device ids.
+
- Prevent smtpd(8) from fork-bombing on startup when there are lots of mails in the offline queue by using a wait list to keep the number of forked processes below a reasonable limit when enqueueing.
+
- Make tmux(1) change window with mouse wheel over status line if mouse-select-window is on.
+
- Prevent use of strnvis(3) in tmux(1) title as it breaks UTF-8.
+
- Make tmux(1) check if mouse-select-pane is on, not off when setting mouse flags.
+
- Collapse mbuf(9) m_pullup and m_pullup2 into a single function.
+
- Fixed macppc volume keyboard keys.
+
- Cleaned up gotos in TCP input listening sockets to make it obvious when packets are dropped and when normal program flow occurs. Changed error return value of syn_cache_add() from 0 to -1 in order to clearly communicate intent.
+
- Added a zlib.pc pkg-config(1) file.
+
+
- Gave more room to hppa64 kernel stack.
+
- Make hppa64 properly save and restore the space registers to/from the trap frame.
+
- Make aucat(1) determine the default device in backend code instead of common code.
+
- Moved softraid(4) SLIST initializations earlier so that failure handling paths can safely use them.
+
- Make aucat(1) in server mode listen on all addresses when given '-' for address.
+
+
- Fixed problems when there is an endian differences between aucat(1) server and client.
+
- Make aucat(1) set the TCP_NODELAY option for TCP connections.
+
- Fixed bad return value check in OpenCVS.
+
- Fixed string containing state names used for debug printf() in aucat(1).
+
- Fixed potential NULL dereference in ioprbs(4), ray(4), IPv6 fragmentation code and output routines.
+
- Prevented myx(4) from checking malloc(3) return values against NULL as M_WAITOK is used.
+
- Added libdrm_radeon to the system libraries.
+
- Make radeon(4) use the r600 driver for r600+ chipsets, not r300. Should stop annoying errors for GL on r{6,7}00 chipsets.
+
- Added PCI-Cardbus bridges and the most popular PCMCIA and CardBUS drivers to sgi GENERIC and RAMDISK kernels.
+
- Make hppa handle userland pmap(9) mapping on unmanaged pages better.
+
- Fixed em(4) 82578DC from only being able to negotiate at 10baseT.
+
- Make the network stack recognize SO_RTABLE socket option (getsockopt(2), setsockopt(2)) at the SOL_SOCKET level.
+
- Make iked(8) active SA lookup via policy work for NAT traversal.
+
- Added a workaround for an em(4) 82579 hardware bug that can result in lost rx packets between the mac and phy.
+
- Reworked iscsid(8) logout code.
+
+
- Reworked and improved iscsid(8) logout.
+
- Fixed counting of interrupts for devices that attach to elroy(4/HPPA).
+
- Updated inteldrm(4) to the one contained in libdrm 2.4.23 for the ddx update and to stop mesa 7.9.2 crashing.
+
- Copied glxinfo(1) and glxgears(1) sources from Mesa Demos.
+
- Fixed NULL dereference if inteldrm(4) fails to attach.
+
- Splitted sudo(8) ALL, ROLE and TYPE into their own actions.
+
- Fixed reload issue with changing network statements.
+
- Make bgpd(8) free cname and rcname on exit.
+
- Make sure to cast mips64 physmem to a 64-bit type before passing it to ptoa().
+
+
- Make pppoe use gid_t for setgroups().
+
- Make asa(1) return > 0 when file is not found.
+
- Make sh internal serial driver use cons_decl() instead of its own cn* prototypes.
+
- Plugged holes in sparc and vax cdevsw[] to make vscsi(4), diskmap(4) and pppx entries match numbers in comments and the MAKEDEV majors.
+
- Improved malloc(3) scanning for free chunks without losing any randomization.
+
+
- Make gcc -02 raise an underflow exception on m88k to prevent incorrect optimizations in floating-point environments.
+
- Improved sudo(8) netmask regexp.
+
- Fixed gre(4) strange problems seen on directly connected tunnels.
+
- Make softraid(4) only handle vanilla scsi inquiry requests and reject VPD requests since they are not handled.
+
- Fixed carp(4) IPv6 only setups.
+
- Make tmux(1) redraw only the status line on command update and not the entire client.
+
- Explicitly pass the rdomain to tcp_respond() to prevent a RST from being sent on rdomain 0 in certain failure cases.
+
- Prevent SCSI devices from inheriting the adapters addresses on fc fabrics.
+
+
- Make iscsid(8) try to schedule a new task for the connection in conn_task_cleanup().
+
- Make sure vscsi DATA OUT operations are piggibacked on the same connection as the initial SCSI REQUEST.
+
- Enabled floating-point environment in all archs.
+
- Bring back fwprintf() in libc and in gcc4 libstdc++.
+
- Improved and cleaned floating-point environment.
+
- Make mpath(4) retry commands in iscsid(8) when it comes back.
+
- Make IPv4 in_broadcast() rdomain aware.
+
- Fixed boot hangs due to usb(4) abuse of kthread_create_deferred(9).
+
- Allow SOCK_DGRAM sockets sockets to be bound to the local network broadcast addr in TCP/IP PCB and raw IP functions.
+
- Implemented a new authentication method allowing aucat and midicat to work over TCP.
+
+
- Switched ftp-proxy over to divert-to instead of rdr-to.
+
- Fixed some off-by-one errors in atapiscsi(4).
+
- Make acpithinkpad(4) attach to newer Lenovo models like the x120e.
+
- Default gcc(1) on alpha to -mfp-rounding-mode=d, for code which assumes the rounding mode is always controlled by fpsetround(3).
+
- Added toggable verbosity to iscsid(8).
+
- Simplified ioprbs(4) scsi_xfer handling.
+
- Make aucat(1) use more volatile sig_atomic_t in signal handler.
+
- Added hds(4) a driver for Hitachi Modular Storage SCSI devices.
+
- Prevent i386 from explicitly enabling an interrupt before returning from an interrupt.
+
- Added support for rooting off multipath disks in sparc64.
+
- Added support for Intel 6 series SATA in non RAID, non AHCI mode.
+
- Fixed du(1) output for directories larger than 1 TB.
+
- Added preliminary FSM support in iscsid(8).
+
- Make mpath(4) use DMA safe memory when talking to devices.
+
- Fixed envy(4) interrupt handler if it's shared with other pci devices.
+
- Prevent mpi(4) from trying to issue SCSI commands against a target where it failed to get the RAID headers.
+
- Make mpi(4) configure fc controllers to fail io as fast as possible when cables are yanked.
+
- Make mpath(4) retry the IO down another path when a path returns XS_SELTIMEOUT.
+
- Make mpi(4) nicer with mpath(4) when unplugging it from paths.
+
- Make mpi(4) scanning of fibre channel ports match the way Linux does it.
+
+
- Set UVM_FLAG_FIXED in sparc, sparc64 and vax.
+
- Make dpt(4) use iopools.
+
- Make ipsec(4) ipsec_input() pass IPv4 or IPv6 packets to the correct raw ip input function if ipsec(4) is disabled.
+
- Added floating-point environment for mips64.
+
- Make gcc default to -mpf-rounding-mode=d on alpha.
+
- Make dpt(4) compile on 64-bits arches.
+
- Allow the root device to be identified by its disklabel(8) UID on amd64 and i386.
+
- Make trm(4) use iopools.
+
+
- Added FPU emulation option to octeon.
+
- Added floating-point environment for powerpc and sparc.
+
- Teach sysconf(_SC_GETGR_R_SIZE_MAX) the correct size of a buffer for the reentrant getgrent(3) functions (getgrgid_r, getgrnam_r).
+
- Removed svnd backward compatibility from vnd(4).
+
- Updated xf86-input-vmmouse to version 12.7.0.
+
- Make xf86-input-usbtablet handle obsolete X{alloc,free,realloc) functions.
+
- Adapted xf86-input-usbtablet to revision 12.
+
- Prevent dump(8) from using stdio in the SIGSEGV handler.
+
- Fixed worms(6) "-d delay" option.
+
- Update timezone to tzdata2011g from elsie.nci.nih.gov.
+
- Fixed bug in ioprbs(4).
+
- Allow commands like "route add 0.0.0.0/1 $SOMEHOST" to work correctly, previously they operated on the default route.
+
- Prevent pkg_add(1) from erasing first man page in case two man pages have the same name.
+
+
- Provided #h for short hostname (no domain) in tmux(1).
+
- Make tmux(1) copy behaviour in vi mode slightly more like vi(1).
+
- Make azalia(4) detachable and prevent constant interrupts when the device isn't used.
+
- Merged GNU binutils 2.17.
+
- Make a double link between pf(4) states and sockets.
+
- Prevent mandoc(1) from breaking lines right before numbers, as Groff does.
+
- Updated xf86-input-ws to revision 1.3.0.
+
- Merged mandoc(1) version 1.11.1. Mostly cleanup and maintenance.
+
- Added C99 floating-point environment in sh.
+
- Make ahci(4) get the error ccbs state right for a put when a port is empty. Fixes noise during boot.
+
- Enforced correct types in relayd(8).
+
- Updated xorg-docs to version 1.6.
+
- Removed support for very old ffson-disk formats from fsck_ffs(8).
+
- Make radeondrm(4) match HD5450.
+
- Make umsm(4) match Sierra USB305.
+
- Prevent chio(1) and mt(1) from opening the 'c' partition on on devices that don't have one.
+
- Implemented C99 floating-point environment for alpha, arm, i386 and sparc64.
+
+
- Make hppa stop calling shared interrupt handlers as soon as one of them return 1 (positive interrupt was for me), like it's done on other architectures.
+
- Prevent i386 kernel code or read only data to be writable by ddb(4). Only enable write for ddb(4) in the page table entry temporally.
+
- Enabled the SIGWINCH handler in ncurses.
+
- Added FE_DENORMAL to amd64 C99 floating-point environment.
+
- Fixed sticky flags in hppa64 fpsr.
+
- Make sysarch(2) available for userland in alpha.
+
- Improved security(8) report of devices or setuid files owned by a nonexistent user or group.
+
- Prevent vnd(4) from being opened for write in both simple and non-simple mode.
+
- Fixed bug with autovivification in security(8).
+
+
- Make traceroute(8) only print changed TOS in returned packets when -t is set.
+
- Updated xf86-input-keyboard to version 1.6.0, xf86-input-mouse to 1.7.0.
+
- Make beagle start at high ipl.
+
- Make isakmpd(8) indicate which side of the connection responded during phase 1 while using -v.
+
- Fixed uninitialized variables and formatting strings in acpi(4).
+
- Prevent amd64 and i386 from printing irrelevant PCI interrupt line programmed by the BIOS for APIC interrupts.
+
- Fixed sticky flags in hppa fpsr.
+
- Added support for PCH2 (Sandy Bridge) MAC with em(4) 82579 PHY.
+
+
- Moved the rc.d(8) bits from rc.{local,shutdown} directly into /etc/rc. By default, rc.{local,shutdown} don't output anything anymore.
+
- Merged version 1.10.10 of mandoc(1): mainly cleanups and maintenance version.
+
- Added C99 floating-point environment to adm64 and hppa.
+
- Speed up softraid(4) XORP and XORQ operations in RAID6.
+
- Fixed sgi dma_constraint upper limit computation.
+
- Make sgi print memory sizes as longs.
+
- Make sgi use 64 bit integer to compute IP35 memory ranges.
+
- Make nsd-zonec(8) less verbose in nsdc(8) runs.
+
- Improved sysmerge(8) detection of obsolete files.
+
- Added a filter-routes option to snmpd.conf(5).
+
- Added many improvements to hppa64 machine-dependent code.
+
- Prevent apmd(8) daemon from hiding to the user it failed.
+
- Fixed some long versus 64 bit type mismatches.
+
- Make ahci(4) reserve its own ccb.
+
- Make find(1) return exit code 1 if any path could not be traversed, as told by POSIX.
+
- Fixed multibyte characters length mesuration in citrus.
+
+
- Updated xf86-input-ws to version 1.3.0: API compatibility with Xserver 1.10, sync build system with other Xorg input modules.
+
- Updated x11proto to version 7.0.21, xf86-input-keyboard to 1.6.0, xf86-input-mouse to 1.7.0, xorg-docs to 1.6.
+
- Make awk(1) store the old seed when srand() is called and use it as the return value, as told by POSIX.
+
- Fixed bugs in rint(3).
+
- Fixed potential NULL dereference in compat_linux(8).
+
- Make OpenCVS diff use -u when its context is 3.
+
- Implemented correct prologue and epilogue for hpp64 machine-dependent initialization.
+
- Added perl security fix for CVE-2011-1487.
+
- Enhanced sysmerge(8) output.
+
- Fixed return value in arc(4) interrupt handler.
+
- Removed Potential NULL dereference in amd64 AES, amd64 and i386 VIA machine-dependent code.
+
- Added support for Intel GM45 SOL in puc(4).
+
- Prevent vr(4) from disabling interrupts in the isr before enabling them again when leaving.
+
+
- Make gdt(4) use iopools.
+
- Simplified umass(4) devid generation.
+
- Make midi keyboards work with macppc.
+
- Fixed potential null dereference in pf(4) ioctl, ahd(4).
+
- Fixed dead assignments in spdmem(4).
+
- Fixed dead store in wscons(4).
+
- Removed UUCP special directory permission.
+
- Automatically enter copy-mode in tmux(1) when mode-mouse is on and the mouse is dragged or its wheel is used.
+
- Disabled mvme88k 88110 branch prediction logic on all revisions.
+
- Fixed uname(3) return value check in tmux(1).
+
- Added missing call to pmap_update() in uvm(9) km_alloc().
+
- Make uvm(9) kernel memory free the correct pages when virtual addresses failed to be allocated.
+
- Fixed type error in an amd64 vector.S comparison.
+
- Make the IPv4 stack use an RB tree for local address lookups.
+
- Include USB vendor and product ids in umass(4) when manufacturing a unique disk id from a USB serial number, as recommended by the umass spec.
+
+
- Changed pool(9) constraints to use kmem_pa_mode instead of uvm_constraint_range. Use km_alloc(9) for all backend allocations in pool(9) and for the emergency kentry allocations in uvm(9) uvm_mapent_alloc. Garbage collect uvm_km_getpage, uvm_km_getpage_pla and uvm_km_putpage.
+
- Fixed type bug in rdist(1).
+
- Added Perl security fix for CVE-2011-1487: ucfirst(), uc() and lc() forget to set the tainted flag if input was marked as tainted.
+
- Make sure the mouse should only work in copy mode for tmux(1) if mode-mouse is set, not just mouse-select-pane.
+
- Added an option to tmux(1): mouse-select-window. It allows the mouse to be used by clicking on the status line.
+
- Changed kernel pool constraints to us kmem_pa_mode instead of uvm_constraint_range; use km_alloc(9) for all backend allocations in pools; use km_alloc(9) for the emergency kentry allocations in uvm_mapent_alloc; garbage collect uvm_km_getpage, uvm_getpage_pla and uvm_km_putpage.
+
- Prevent rc.local from printing 'starting local daemons' if rc_scripts is empty.
+
- Updated Test::Simple(3p) to version 0.98.
+
- Deprecated vnds in favour of svnds.
+
- Removed the old style by-pass-the-buffer-cache vnd(4) code. This will treat vndX the same as svndX.
+
- Make rdist(1) print size_t with %zu and ssize_t with %zd in error/debug output.
+
- Improved the iked(8) acquire mode peer, policy matching.
+
- Added support for "acquire mode" from iked(8) static flows.
+
- Updated List::Util(3p) to version 1.23.
+
- Fixed a sysmerge(8) bug where OBSOLETE_FILES would contain only the last appended occurrence. Display OBSOLETE_FILES on stdout.
+
- Modify bnx(4) interrupt handler so it only processes the rings once rather than looping over them until it runs out of work to do.
+
- Run the ppb(4) interrupt handler at IPL_BIO.
+
- Make pciide(4), wdc(4) and wd(4) watch for wdc(4) registers returning 0xff which probably means the controller is dead.
+
- Packed ssh-keygen(1) certificate options in lexical order of option name.
- Prevent scsi(4) devices from attaching if mpath(4) is disabled in config or ukc.
- Allow graceful shutdown of ssh(1) multiplexing: request that a mux server removes its listener socket and refuse future multiplexing requests.
***************
*** 645,651 ****
www@openbsd.org
!
$OpenBSD: plus.html,v 1.1196 2011/06/17 18:59:36 jj Exp $