Mon, 04 Aug 2008 13:45:10 -0700 Added tag jdk7-b32 for changeset aded486da6fd
xdono [Mon, 04 Aug 2008 13:45:10 -0700] rev 935
Added tag jdk7-b32 for changeset aded486da6fd
Wed, 05 Jul 2017 16:39:53 +0200 Merge
duke [Wed, 05 Jul 2017 16:39:53 +0200] rev 934
Merge
Mon, 04 Aug 2008 13:44:54 -0700 Added tag jdk7-b32 for changeset a89e8027a876
xdono [Mon, 04 Aug 2008 13:44:54 -0700] rev 933
Added tag jdk7-b32 for changeset a89e8027a876
Wed, 05 Jul 2017 16:39:50 +0200 Merge
duke [Wed, 05 Jul 2017 16:39:50 +0200] rev 932
Merge
Mon, 04 Aug 2008 13:44:53 -0700 Added tag jdk7-b32 for changeset ebccb17151f8
xdono [Mon, 04 Aug 2008 13:44:53 -0700] rev 931
Added tag jdk7-b32 for changeset ebccb17151f8
Wed, 05 Jul 2017 16:39:48 +0200 Merge
duke [Wed, 05 Jul 2017 16:39:48 +0200] rev 930
Merge
Tue, 12 Aug 2008 15:16:51 -0700 Merge
xdono [Tue, 12 Aug 2008 15:16:51 -0700] rev 929
Merge
Wed, 06 Aug 2008 16:08:15 -0700 6724669: JDK7: Official change to Sun Studio 12 compilers on Solaris
ohair [Wed, 06 Aug 2008 16:08:15 -0700] rev 928
6724669: JDK7: Official change to Sun Studio 12 compilers on Solaris Reviewed-by: tbell
Wed, 06 Aug 2008 14:30:28 -0700 6734545: Corrections to missing explicit corba sources on javac compile lines
ohair [Wed, 06 Aug 2008 14:30:28 -0700] rev 927
6734545: Corrections to missing explicit corba sources on javac compile lines Reviewed-by: tbell
Thu, 07 Aug 2008 09:40:30 -0700 Merge
tbell [Thu, 07 Aug 2008 09:40:30 -0700] rev 926
Merge
Fri, 01 Aug 2008 13:37:17 -0700 6732815: CORBA_2_3 java sources not explicitly compiled
ohair [Fri, 01 Aug 2008 13:37:17 -0700] rev 925
6732815: CORBA_2_3 java sources not explicitly compiled Reviewed-by: tbell
Mon, 04 Aug 2008 13:44:45 -0700 Added tag jdk7-b32 for changeset 9ab23b73f1b9
xdono [Mon, 04 Aug 2008 13:44:45 -0700] rev 924
Added tag jdk7-b32 for changeset 9ab23b73f1b9
Wed, 05 Jul 2017 16:39:45 +0200 Merge
duke [Wed, 05 Jul 2017 16:39:45 +0200] rev 923
Merge
Tue, 12 Aug 2008 15:17:12 -0700 Merge
xdono [Tue, 12 Aug 2008 15:17:12 -0700] rev 922
Merge
Fri, 08 Aug 2008 08:52:18 -0700 Merge
ohair [Fri, 08 Aug 2008 08:52:18 -0700] rev 921
Merge
Fri, 08 Aug 2008 08:50:30 -0700 6734977: Fix build failure regarding the now deleted file jdk/README.html
ohair [Fri, 08 Aug 2008 08:50:30 -0700] rev 920
6734977: Fix build failure regarding the now deleted file jdk/README.html Reviewed-by: xdono, tbell
Wed, 06 Aug 2008 16:43:53 -0700 Merge
ohair [Wed, 06 Aug 2008 16:43:53 -0700] rev 919
Merge
Wed, 06 Aug 2008 16:21:20 -0700 6724669: JDK7: Official change to Sun Studio 12 compilers on Solaris
ohair [Wed, 06 Aug 2008 16:21:20 -0700] rev 918
6724669: JDK7: Official change to Sun Studio 12 compilers on Solaris Reviewed-by: tbell
Wed, 30 Jul 2008 19:40:57 -0700 6729772: 64-bit build with SS12 compiler: SIGSEGV (0xb) at pc=0x0000000000000048, pid=14826, tid=2
ohair [Wed, 30 Jul 2008 19:40:57 -0700] rev 917
6729772: 64-bit build with SS12 compiler: SIGSEGV (0xb) at pc=0x0000000000000048, pid=14826, tid=2 Reviewed-by: tbell
Wed, 06 Aug 2008 15:02:15 -0700 6728161: Add SKIP_BOOT_CYCLE feature to create boot jdk and use it during build
ohair [Wed, 06 Aug 2008 15:02:15 -0700] rev 916
6728161: Add SKIP_BOOT_CYCLE feature to create boot jdk and use it during build Summary: Needed BOOT_JAR_JFLAGS. Fixed PREVIOUS_RELEASE_IMAGE. Reviewed-by: tbell
Thu, 07 Aug 2008 09:42:31 -0700 Merge
tbell [Thu, 07 Aug 2008 09:42:31 -0700] rev 915
Merge
Fri, 01 Aug 2008 15:21:56 -0700 Merge
tbell [Fri, 01 Aug 2008 15:21:56 -0700] rev 914
Merge
Tue, 29 Jul 2008 16:57:09 -0700 Merge
wetmore [Tue, 29 Jul 2008 16:57:09 -0700] rev 913
Merge
Tue, 29 Jul 2008 10:18:25 -0700 Merge
wetmore [Tue, 29 Jul 2008 10:18:25 -0700] rev 912
Merge
Tue, 29 Jul 2008 09:53:35 -0700 6730740: Fix for 6729881 has apparently broken several 64 bit tests: "Bad address"
chegar [Tue, 29 Jul 2008 09:53:35 -0700] rev 911
6730740: Fix for 6729881 has apparently broken several 64 bit tests: "Bad address" Reviewed-by: alanb, jccollet
Mon, 28 Jul 2008 13:02:11 +0100 6729881: Compiler warning in networking native code
chegar [Mon, 28 Jul 2008 13:02:11 +0100] rev 910
6729881: Compiler warning in networking native code Summary: Cleanup compiler warnings Reviewed-by: alanb, jccollet, michaelm
Sun, 27 Jul 2008 19:16:15 +0800 6709758: keytool default cert fingerprint algorithm should be SHA1, not MD5
weijun [Sun, 27 Jul 2008 19:16:15 +0800] rev 909
6709758: keytool default cert fingerprint algorithm should be SHA1, not MD5 Reviewed-by: mullan, xuelei
Wed, 23 Jul 2008 12:16:28 -0700 Merge
wetmore [Wed, 23 Jul 2008 12:16:28 -0700] rev 908
Merge
Wed, 23 Jul 2008 12:05:19 +0100 6728076: Test case for 6536211 is failing on all platforms
michaelm [Wed, 23 Jul 2008 12:05:19 +0100] rev 907
6728076: Test case for 6536211 is failing on all platforms Summary: exception needed to be caught and logged Reviewed-by: chegar
Sat, 19 Jul 2008 10:27:34 +0100 6726164: jdk\src\windows\native\java\net\NetworkInterface.h(172) : error C2365: 'IpPrefixOriginOther' : redef
chegar [Sat, 19 Jul 2008 10:27:34 +0100] rev 906
6726164: jdk\src\windows\native\java\net\NetworkInterface.h(172) : error C2365: 'IpPrefixOriginOther' : redef Summary: Change the NetworkInterface header that allows it to compile on the current compiler/SDK version as well as the SDK bundled with Visual Studio 2008. Reviewed-by: ohair, alanb
Mon, 14 Jul 2008 11:39:42 +0100 6536211: flaw in ServerImpl
michaelm [Mon, 14 Jul 2008 11:39:42 +0100] rev 905
6536211: flaw in ServerImpl Summary: removed doPrivileged block Reviewed-by: jccollet
Wed, 09 Jul 2008 12:03:16 +0800 6480981: keytool should be able to import certificates from remote SSL servers
weijun [Wed, 09 Jul 2008 12:03:16 +0800] rev 904
6480981: keytool should be able to import certificates from remote SSL servers Reviewed-by: vinnie, wetmore
Mon, 07 Jul 2008 13:06:58 -0700 Merge
wetmore [Mon, 07 Jul 2008 13:06:58 -0700] rev 903
Merge
Tue, 01 Jul 2008 13:38:59 +0200 6656849: NullPointerException thrown while de-serializing IPV6 Address.
jccollet [Tue, 01 Jul 2008 13:38:59 +0200] rev 902
6656849: NullPointerException thrown while de-serializing IPV6 Address. Summary: Check for existence of interface name earlier in code Reviewed-by: michaelm
Tue, 01 Jul 2008 13:29:36 +0200 6713809: FTP fails from multi-homed system
jccollet [Tue, 01 Jul 2008 13:29:36 +0200] rev 901
6713809: FTP fails from multi-homed system Summary: Binds the data socket to the same address as the control socket Reviewed-by: michaelm
Tue, 29 Jul 2008 19:21:59 +0200 6402254: Revisit ModelMBean DescriptorSupport implementation of equals and hashCode.
dfuchs [Tue, 29 Jul 2008 19:21:59 +0200] rev 900
6402254: Revisit ModelMBean DescriptorSupport implementation of equals and hashCode. Reviewed-by: emcmanus
Mon, 28 Jul 2008 12:37:52 -0700 6730587: TEST: com/sun/jdi/MonitorFrameInfoTest.java fails with -server -Xcomp
jjh [Mon, 28 Jul 2008 12:37:52 -0700] rev 899
6730587: TEST: com/sun/jdi/MonitorFrameInfoTest.java fails with -server -Xcomp Summary: Fix test to prevent C2 escape analysis from deleting the required synchronized blocks Reviewed-by: swamyv
Sat, 26 Jul 2008 20:42:35 -0700 6681798: (build) CharsetEncoder.java fails to compile in openjdk6 on ubutu 8.04
sherman [Sat, 26 Jul 2008 20:42:35 -0700] rev 898
6681798: (build) CharsetEncoder.java fails to compile in openjdk6 on ubutu 8.04 Summary: replace awk-sed based spp.sh with a java regex based pre-processor Reviewed-by: alanb
Fri, 25 Jul 2008 12:40:22 +0200 6672135: setInterval() for local MonitoredHost and local MonitoredVm does not work
thurka [Fri, 25 Jul 2008 12:40:22 +0200] rev 897
6672135: setInterval() for local MonitoredHost and local MonitoredVm does not work Summary: super.setInterval() invoked with correct value Reviewed-by: swamyv
Thu, 24 Jul 2008 14:03:16 -0700 6725543: Compiler warnings in serviceability native code
ohair [Thu, 24 Jul 2008 14:03:16 -0700] rev 896
6725543: Compiler warnings in serviceability native code Reviewed-by: alanb
Thu, 24 Jul 2008 12:46:41 +0100 6726309: Compiler warnings in nio code
alanb [Thu, 24 Jul 2008 12:46:41 +0100] rev 895
6726309: Compiler warnings in nio code Reviewed-by: sherman, iris
Thu, 24 Jul 2008 12:40:30 +0100 6728728: (se) WindowsSelectorImpl.c doesn't compile with Visual Studio 2008
alanb [Thu, 24 Jul 2008 12:40:30 +0100] rev 894
6728728: (se) WindowsSelectorImpl.c doesn't compile with Visual Studio 2008 Reviewed-by: tbell, chegar
Thu, 07 Aug 2008 04:52:05 -0700 Merge
jtusla [Thu, 07 Aug 2008 04:52:05 -0700] rev 893
Merge
Fri, 01 Aug 2008 02:58:59 -0700 6608572: Currency change for Malta and Cyprus
jtusla [Fri, 01 Aug 2008 02:58:59 -0700] rev 892
6608572: Currency change for Malta and Cyprus Summary: Change the respective currencies Reviewed-by: naoto, jenda
Fri, 01 Aug 2008 01:46:31 -0700 6509039: Swedish localization has incorrect am/pm markers in FormatData_sv
jtusla [Fri, 01 Aug 2008 01:46:31 -0700] rev 891
6509039: Swedish localization has incorrect am/pm markers in FormatData_sv Summary: Added respective section Reviewed-by: peytoia, jenda
Tue, 05 Aug 2008 17:44:17 -0700 Merge
lana [Tue, 05 Aug 2008 17:44:17 -0700] rev 890
Merge
Thu, 24 Jul 2008 21:12:50 -0700 Merge
lana [Thu, 24 Jul 2008 21:12:50 -0700] rev 889
Merge
Tue, 22 Jul 2008 11:24:32 -0700 6728492: typo in copyrights in some files touched by the d3d pipeline port
tdv [Tue, 22 Jul 2008 11:24:32 -0700] rev 888
6728492: typo in copyrights in some files touched by the d3d pipeline port Reviewed-by: prr
Fri, 18 Jul 2008 10:48:44 -0700 6725214: D3D: forward-port the new pipeline from 6u10
tdv [Fri, 18 Jul 2008 10:48:44 -0700] rev 887
6725214: D3D: forward-port the new pipeline from 6u10 Summary: Forward port of the new Direct3D 9 rendering pipeline from 6u10. Also includes fixes for 6690659 6689025 6658398 6596234. Reviewed-by: campbell, prr
Tue, 15 Jul 2008 16:04:08 +0400 6720240: IOB exception when getting font metrics of hershey font
igor [Tue, 15 Jul 2008 16:04:08 +0400] rev 886
6720240: IOB exception when getting font metrics of hershey font Reviewed-by: bae, prr
Mon, 23 Jun 2008 13:00:19 -0700 6708509: print dialog is not displayed when default paper is custom
jgodinez [Mon, 23 Jun 2008 13:00:19 -0700] rev 885
6708509: print dialog is not displayed when default paper is custom Reviewed-by: tdv, prr
Tue, 17 Jun 2008 18:38:20 -0700 6711377: test/java/awt/font/TextLayout/VisibleAdvance.java missing GPL
srl [Tue, 17 Jun 2008 18:38:20 -0700] rev 884
6711377: test/java/awt/font/TextLayout/VisibleAdvance.java missing GPL Reviewed-by: igor, prr
Thu, 12 Jun 2008 13:17:33 -0700 6378099: RFE: Use libfontconfig to create/synthesise a fontconfig.properties
prr [Thu, 12 Jun 2008 13:17:33 -0700] rev 883
6378099: RFE: Use libfontconfig to create/synthesise a fontconfig.properties Reviewed-by: tdv, igor
Thu, 05 Jun 2008 14:18:37 -0700 Merge
lana [Thu, 05 Jun 2008 14:18:37 -0700] rev 882
Merge
Wed, 28 May 2008 20:06:09 +0400 6587560: OpenJDK problem handling bitmaps returned when LCD text is requested
igor [Wed, 28 May 2008 20:06:09 +0400] rev 881
6587560: OpenJDK problem handling bitmaps returned when LCD text is requested Reviewed-by: bae, prr
Mon, 04 Aug 2008 13:45:00 -0700 Added tag jdk7-b32 for changeset be386e469547
xdono [Mon, 04 Aug 2008 13:45:00 -0700] rev 880
Added tag jdk7-b32 for changeset be386e469547
Wed, 05 Jul 2017 16:39:36 +0200 Merge
duke [Wed, 05 Jul 2017 16:39:36 +0200] rev 879
Merge
Mon, 04 Aug 2008 13:44:48 -0700 Added tag jdk7-b32 for changeset 49e709107aec
xdono [Mon, 04 Aug 2008 13:44:48 -0700] rev 878
Added tag jdk7-b32 for changeset 49e709107aec
Tue, 12 Aug 2008 15:16:49 -0700 Merge
xdono [Tue, 12 Aug 2008 15:16:49 -0700] rev 877
Merge
Wed, 06 Aug 2008 16:39:58 -0700 Merge
ohair [Wed, 06 Aug 2008 16:39:58 -0700] rev 876
Merge
Wed, 06 Aug 2008 16:06:43 -0700 6724669: JDK7: Official change to Sun Studio 12 compilers on Solaris
ohair [Wed, 06 Aug 2008 16:06:43 -0700] rev 875
6724669: JDK7: Official change to Sun Studio 12 compilers on Solaris Reviewed-by: tbell
Wed, 06 Aug 2008 14:57:13 -0700 6728161: Add SKIP_BOOT_CYCLE feature to create boot jdk and use it during build
ohair [Wed, 06 Aug 2008 14:57:13 -0700] rev 874
6728161: Add SKIP_BOOT_CYCLE feature to create boot jdk and use it during build Reviewed-by: tbell
Mon, 04 Aug 2008 13:44:44 -0700 Added tag jdk7-b32 for changeset 52d57178a9d7
xdono [Mon, 04 Aug 2008 13:44:44 -0700] rev 873
Added tag jdk7-b32 for changeset 52d57178a9d7
Wed, 05 Jul 2017 16:39:28 +0200 Added tag jdk7-b32 for changeset a9f1805e3ba9
duke [Wed, 05 Jul 2017 16:39:28 +0200] rev 872
Added tag jdk7-b32 for changeset a9f1805e3ba9
Wed, 05 Jul 2017 16:39:28 +0200 Merge jdk7-b32
duke [Wed, 05 Jul 2017 16:39:28 +0200] rev 871
Merge
Wed, 05 Jul 2017 16:39:25 +0200 Merge
duke [Wed, 05 Jul 2017 16:39:25 +0200] rev 870
Merge
Tue, 22 Jul 2008 11:41:45 -0700 Merge
tbell [Tue, 22 Jul 2008 11:41:45 -0700] rev 869
Merge
Tue, 15 Jul 2008 19:22:51 -0700 6657907: javadoc has unchecked warnings
jjg [Tue, 15 Jul 2008 19:22:51 -0700] rev 868
6657907: javadoc has unchecked warnings Reviewed-by: bpatel
Tue, 15 Jul 2008 09:50:36 -0700 6724071: refactor Log into a front end and back end
jjg [Tue, 15 Jul 2008 09:50:36 -0700] rev 867
6724071: refactor Log into a front end and back end Reviewed-by: darcy
Fri, 18 Jul 2008 11:25:41 -0700 Merge
tbell [Fri, 18 Jul 2008 11:25:41 -0700] rev 866
Merge
Fri, 11 Jul 2008 14:59:48 -0700 6725036: javac returns incorrect value for lastModifiedTime() when source is a zip file archive
jjg [Fri, 11 Jul 2008 14:59:48 -0700] rev 865
6725036: javac returns incorrect value for lastModifiedTime() when source is a zip file archive Reviewed-by: darcy
Thu, 10 Jul 2008 16:50:38 -0700 6724551: Use Queues instead of Lists to link compiler phases
jjg [Thu, 10 Jul 2008 16:50:38 -0700] rev 864
6724551: Use Queues instead of Lists to link compiler phases Reviewed-by: darcy
Thu, 10 Jul 2008 11:25:23 -0700 6724327: eliminate use of shell tests for simple golden file tests
jjg [Thu, 10 Jul 2008 11:25:23 -0700] rev 863
6724327: eliminate use of shell tests for simple golden file tests Reviewed-by: darcy
Tue, 08 Jul 2008 18:06:19 -0700 4501661: disallow mixing -public, -private, and -protected options at the same time
jjg [Tue, 08 Jul 2008 18:06:19 -0700] rev 862
4501661: disallow mixing -public, -private, and -protected options at the same time Reviewed-by: ksrini
Tue, 08 Jul 2008 17:53:03 -0700 6716452: (classfile) need a method to get the index of an attribute
jjg [Tue, 08 Jul 2008 17:53:03 -0700] rev 861
6716452: (classfile) need a method to get the index of an attribute Reviewed-by: ksrini
Tue, 08 Jul 2008 17:25:50 -0700 6715753: unknown option error can be a little more helpful
jjg [Tue, 08 Jul 2008 17:25:50 -0700] rev 860
6715753: unknown option error can be a little more helpful Reviewed-by: ksrini
Tue, 08 Jul 2008 17:14:22 -0700 6715757: javap does not print "extends java.lang.Object"
jjg [Tue, 08 Jul 2008 17:14:22 -0700] rev 859
6715757: javap does not print "extends java.lang.Object" Reviewed-by: ksrini
Tue, 08 Jul 2008 16:59:27 -0700 6715251: javap should be consistent with javac and return 2 if given no arguments
jjg [Tue, 08 Jul 2008 16:59:27 -0700] rev 858
6715251: javap should be consistent with javac and return 2 if given no arguments Reviewed-by: ksrini
Thu, 17 Jul 2008 11:28:51 -0700 Added tag jdk7-b31 for changeset bcb5c0d7c1ab
xdono [Thu, 17 Jul 2008 11:28:51 -0700] rev 857
Added tag jdk7-b31 for changeset bcb5c0d7c1ab
Wed, 05 Jul 2017 16:39:22 +0200 Merge
duke [Wed, 05 Jul 2017 16:39:22 +0200] rev 856
Merge
Thu, 17 Jul 2008 11:28:40 -0700 Added tag jdk7-b31 for changeset 3e8ca32a629a
xdono [Thu, 17 Jul 2008 11:28:40 -0700] rev 855
Added tag jdk7-b31 for changeset 3e8ca32a629a
Wed, 05 Jul 2017 16:39:20 +0200 Merge
duke [Wed, 05 Jul 2017 16:39:20 +0200] rev 854
Merge
Thu, 17 Jul 2008 11:28:38 -0700 Added tag jdk7-b31 for changeset 2378316adee0
xdono [Thu, 17 Jul 2008 11:28:38 -0700] rev 853
Added tag jdk7-b31 for changeset 2378316adee0
Wed, 05 Jul 2017 16:39:18 +0200 Merge
duke [Wed, 05 Jul 2017 16:39:18 +0200] rev 852
Merge
Thu, 17 Jul 2008 11:28:32 -0700 Added tag jdk7-b31 for changeset 918ff19c1a3a
xdono [Thu, 17 Jul 2008 11:28:32 -0700] rev 851
Added tag jdk7-b31 for changeset 918ff19c1a3a
Wed, 05 Jul 2017 16:39:16 +0200 Merge
duke [Wed, 05 Jul 2017 16:39:16 +0200] rev 850
Merge
Sun, 27 Jul 2008 18:42:57 -0700 6727683: Cleanup use of COMPILER_WARNINGS_FATAL in makefiles
ohair [Sun, 27 Jul 2008 18:42:57 -0700] rev 849
6727683: Cleanup use of COMPILER_WARNINGS_FATAL in makefiles Reviewed-by: tbell
Fri, 25 Jul 2008 08:44:20 -0700 Merge
xdono [Fri, 25 Jul 2008 08:44:20 -0700] rev 848
Merge
Wed, 16 Jul 2008 09:51:43 -0700 6548261: Use of SE in make/common/Defs-windows.gmk
ohair [Wed, 16 Jul 2008 09:51:43 -0700] rev 847
6548261: Use of SE in make/common/Defs-windows.gmk Reviewed-by: darcy
Tue, 22 Jul 2008 11:40:06 -0700 Merge
tbell [Tue, 22 Jul 2008 11:40:06 -0700] rev 846
Merge
Thu, 17 Jul 2008 14:26:51 -0700 6405995: (ch) test/java/nio/channels/Selector/Wakeup.java broken
sherman [Thu, 17 Jul 2008 14:26:51 -0700] rev 845
6405995: (ch) test/java/nio/channels/Selector/Wakeup.java broken Summary: Moved the unit test case back to open repo, it works after bugfixes in jdk6 Reviewed-by: alanb
Wed, 16 Jul 2008 15:37:23 -0700 Merge
sherman [Wed, 16 Jul 2008 15:37:23 -0700] rev 844
Merge
Wed, 16 Jul 2008 15:24:15 -0700 6429289: (se) sun.nio.ch.SelectorImpl.processDeregisterQueue creates excessive garbage
sherman [Wed, 16 Jul 2008 15:24:15 -0700] rev 843
6429289: (se) sun.nio.ch.SelectorImpl.processDeregisterQueue creates excessive garbage Summary: Check if the cancelledKeys is empty or not before creating iterator Reviewed-by: alanb
Wed, 16 Jul 2008 15:09:24 -0700 6541641: (fc) java/nio/channels/FileChannel/ExpandingMap.java should clean up after itself
sherman [Wed, 16 Jul 2008 15:09:24 -0700] rev 842
6541641: (fc) java/nio/channels/FileChannel/ExpandingMap.java should clean up after itself Summary: Close channel and explicitly de-ref the mapped buffers before exit. Reviewed-by: alanb
Mon, 14 Jul 2008 14:03:42 -0700 6608833: (se spec) SelectionKey @throws references wrong param
sherman [Mon, 14 Jul 2008 14:03:42 -0700] rev 841
6608833: (se spec) SelectionKey @throws references wrong param Summary: Update the API doc to correct the wrong description Reviewed-by: alanb
Fri, 18 Jul 2008 11:24:38 -0700 Merge
tbell [Fri, 18 Jul 2008 11:24:38 -0700] rev 840
Merge
(0) -300 -100 -96 +96 +100 +300 +1000 +3000 +10000 +30000 tip