dholmes [Tue, 01 Dec 2009 22:29:02 -0500] rev 4487
6822370: ReentrantReadWriteLock: threads hung when there are no threads holding onto the lock (Netra x4450)
Summary: This day one bug is caused by missing memory barriers in various Parker::park() paths that can result in lost wakeups and hangs.
Reviewed-by: dice, acorn
coleenp [Wed, 02 Dec 2009 07:59:49 -0800] rev 4486
Merge
mchung [Wed, 25 Nov 2009 08:37:04 -0800] rev 4485
6888880: JKernel VM to inject the sun.jkernel.DownloadManager as a boot classloader hook
Summary: Call sun.jkernel.DownloadManager.setBootClassLoaderHook during the kernel VM initialization
Reviewed-by: alanb, coleenp, acorn
trims [Wed, 23 Dec 2009 02:57:31 -0800] rev 4484
Merge
jmasa [Wed, 23 Dec 2009 00:47:04 -0800] rev 4483
Merge
jmasa [Tue, 22 Dec 2009 22:35:08 -0800] rev 4482
Merge
iveresov [Wed, 16 Dec 2009 15:12:51 -0800] rev 4481
6862387: tune concurrent refinement further
Summary: Reworked the concurrent refinement: threads activation, feedback-based threshold adjustment, other miscellaneous fixes.
Reviewed-by: apetrusenko, tonyp
iveresov [Tue, 22 Dec 2009 17:56:03 -0800] rev 4480
Merge
never [Wed, 16 Dec 2009 22:15:12 -0800] rev 4479
5057818: codecache full and compiler disabled in bigapps fastdebug run
Reviewed-by: kvn
twisti [Wed, 16 Dec 2009 12:48:04 +0100] rev 4478
6829192: JSR 292 needs to support 64-bit x86
Summary: changes for method handles and invokedynamic
Reviewed-by: kvn
trims [Tue, 22 Dec 2009 16:35:08 -0800] rev 4477
6912782: Bump the HS17 build number to 06
Summary: Update the HS17 build number to 06
Reviewed-by: jcoomes
trims [Tue, 22 Dec 2009 16:33:46 -0800] rev 4476
Merge
jmasa [Thu, 17 Dec 2009 07:02:39 -0800] rev 4475
Merge
jmasa [Fri, 11 Dec 2009 09:30:48 -0800] rev 4474
Merge
johnc [Wed, 09 Dec 2009 23:51:38 -0800] rev 4473
6908215: G1: SEGV with G1PolicyVerbose=2 debug flag
Summary: Change CollectionSetChooser::printSortedHeapRegions to handle null entries in _markedRegions growable array.
Reviewed-by: jmasa, tonyp, iveresov
iveresov [Tue, 15 Dec 2009 17:19:40 -0800] rev 4472
Merge
kvn [Wed, 09 Dec 2009 19:50:14 -0800] rev 4471
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
Summary: Move instance store's memory users to corresponding memory slices when updating its memory edge.
Reviewed-by: never
kvn [Wed, 09 Dec 2009 16:40:45 -0800] rev 4470
6895383: JCK test throws NPE for method compiled with Escape Analysis
Summary: Add missing checks for MemBar nodes in EA.
Reviewed-by: never
never [Tue, 08 Dec 2009 16:27:21 -0800] rev 4469
6908167: jbb2005, OptimizeStringConcat causes assert in EA
Reviewed-by: kvn
trims [Tue, 22 Dec 2009 16:32:11 -0800] rev 4468
Merge
trims [Fri, 11 Dec 2009 16:38:37 -0800] rev 4467
Merge
jmasa [Fri, 11 Dec 2009 08:39:30 -0800] rev 4466
Merge
ysr [Tue, 08 Dec 2009 15:12:17 -0800] rev 4465
6908208: UseCompressedOops: array_size() returns incorrect size for MAX_INT object array following 6906727
Summary: In array_size() cast to an unsigned to avoid overflow of intermediate value.
Reviewed-by: kvn, tonyp, jmasa, jcoomes, coleenp
tonyp [Mon, 07 Dec 2009 14:22:34 -0500] rev 4464
6904967: G1: some CollectionUsageThreshold tests fail
Summary: ensure that max and committed are non-zero (currently: at least as large as the region size).
Reviewed-by: iveresov, mchung
tonyp [Fri, 04 Dec 2009 07:44:41 -0500] rev 4463
6906565: G1: deal with compilation warning in g1MemoryPool.hpp
Summary: size_t max_size() hides size_t max_size() const.
Reviewed-by: jmasa, ysr
tonyp [Fri, 04 Dec 2009 07:44:35 -0500] rev 4462
6880903: G1: G1 reports incorrect Runtime.maxMemory()
Summary: G1 reports committed memory instead of reserved memory from the Runtime.maxMemory() method
Reviewed-by: ysr, jmasa
ysr [Thu, 03 Dec 2009 15:01:57 -0800] rev 4461
6906727: UseCompressedOops: some card-marking fixes related to object arrays
Summary: Introduced a new write_ref_array(HeapWords* start, size_t count) method that does the requisite MemRegion range calculation so (some of the) clients of the erstwhile write_ref_array(MemRegion mr) do not need to worry. This removed all external uses of array_size(), which was also simplified and made private. Asserts were added to catch other possible issues. Further, less essential, fixes stemming from this investigation are deferred to CR 6904516 (to follow shortly in hs17).
Reviewed-by: kvn, coleenp, jmasa
johnc [Tue, 24 Nov 2009 15:19:30 -0800] rev 4460
6899058: G1: Internal error in ptrQueue.cpp:201 in nightly tests
Summary: Fixes a race on the dirty card queue completed buffer list between worker thread(s) performing a flush of a deferred store barrier (enqueueing a newly completed buffer) and worker thread(s) in the RSet updating code claiming completed buffers. Removed the routine that removes elements from the completed update buffer queue using a CAS.
Reviewed-by: ysr, tonyp
tonyp [Fri, 20 Nov 2009 14:47:01 -0500] rev 4459
6815790: G1: Missing MemoryPoolMXBeans with -XX:+UseG1GC
Summary: It introduces the necessary memory pools for G1.
Reviewed-by: mchung, ysr
ysr [Thu, 19 Nov 2009 13:43:25 -0800] rev 4458
6902303: G1: ScavengeALot should cause an incremental, rather than a full, collection
Summary: ScavengeALot now causes an incremental (but possibly partially young, in the G1 sense) collection. Some such collections may be abandoned on account of MMU specs. Band-aided a native leak associated with abandoned pauses, as well as an MMU tracker overflow related to frequent scavenge events in the face of a large MMU denominator interval; the latter is protected by a product flag that defaults to false.
Reviewed-by: tonyp
ysr [Thu, 19 Nov 2009 10:19:19 -0800] rev 4457
6902701: G1: protect debugging code related to 6898948 with a debug flag
Summary: Protected stats dump with a new develop flag; other than for the dump, reconciled product and non-product behaviour in face of the error.
Reviewed-by: tonyp
ysr [Fri, 13 Nov 2009 11:55:26 -0800] rev 4456
6898948: G1: forensic instrumentation for out-of-bounds recent_avg_pause_time_ratio()
Summary: Added instrumentation and (temporary) assert in non-product mode; clipped the value when found out-of-bounds in product mode. Fix of original issue will follow collection of data from this instrumentation.
Reviewed-by: jcoomes, tonyp
jmasa [Tue, 10 Nov 2009 11:32:48 -0800] rev 4455
6898857: [Regression] -XX:NewRatio with -XX:+UseConcMarkSweepGC causes fatal error
Summary: Use CollectorPolicy information instead of MaxNewSize
Reviewed-by: ysr, jcoomes
johnc [Fri, 06 Nov 2009 11:10:05 -0800] rev 4454
6895788: G1: SATB and update buffer allocation code allocates too much space
Summary: The type in the NEW_C_HEAP_ARRRY and FREE_C_HEAP_ARRAY calls in the buffer allocation code was changed from void* to char as the size argument had already been mulitipled by the byte size of an object pointer.
Reviewed-by: ysr, tonyp
cfang [Wed, 02 Dec 2009 13:29:00 -0800] rev 4453
6901572: JVM 1.6.16 crash on loops: assert(has_node(i),"")
Summary: Skip the secondary induction variable handling if it is dead
Reviewed-by: never, kvn
iveresov [Tue, 01 Dec 2009 22:11:01 -0800] rev 4452
Merge
cfang [Wed, 25 Nov 2009 12:09:02 -0800] rev 4451
6904191: OptimizeStringConcat should be product instead of experimental
Summary: Make OptimizeStringConcat a product VM option(contributed by never)
Reviewed-by: never
never [Thu, 12 Nov 2009 09:24:21 -0800] rev 4450
6892658: C2 should optimize some stringbuilder patterns
Reviewed-by: kvn, twisti
iveresov [Tue, 01 Dec 2009 14:49:41 -0800] rev 4449
Merge
twisti [Fri, 27 Nov 2009 07:56:58 -0800] rev 4448
6896043: first round of zero fixes
Reviewed-by: kvn
Contributed-by: Gary Benson <gbenson@redhat.com>
kamg [Wed, 25 Nov 2009 09:03:42 -0500] rev 4447
Merge
acorn [Mon, 23 Nov 2009 16:24:35 -0500] rev 4446
Merge
acorn [Wed, 11 Nov 2009 15:49:38 -0500] rev 4445
6893504: LinkageError for bootstrap duplicate class definitions.
Reviewed-by: kamg, xlu
phh [Fri, 20 Nov 2009 16:22:38 -0500] rev 4444
6900899: vm fails to start when -Xmx value is less than OldSize + NewSize
Summary: Set minimum heap size to min(OldSize + NewSize, MaxHeapSize) in Arguments::set_heap_size().
Reviewed-by: kvn, ysr, tonyp
cfang [Tue, 24 Nov 2009 11:49:42 -0800] rev 4443
Merge
kvn [Thu, 19 Nov 2009 14:32:23 -0800] rev 4442
6902036: WorldWind asserts on escape.cpp:1153: assert(addr->is_AddP(),"AddP required")
Summary: Remove the assert.
Reviewed-by: twisti
twisti [Thu, 19 Nov 2009 03:41:29 -0800] rev 4441
6902000: use ShouldNotReachHere() for btos/ctos/stos in TemplateInterpreterGenerator::set_short_entry_points
Summary: set_entry_point is only ever used with the tos states of bytecode templates in templateTable.cpp and none of those use the subword tos states like btos, ctos and stos.
Reviewed-by: kvn
never [Wed, 11 Nov 2009 23:39:17 -0800] rev 4440
6892079: live value must not be garbage failure after fix for 6854812
Reviewed-by: kvn
kamg [Wed, 11 Nov 2009 09:13:12 -0500] rev 4439
Merge
kamg [Fri, 06 Nov 2009 16:05:59 -0500] rev 4438
Merge
phh [Wed, 04 Nov 2009 16:49:23 -0500] rev 4437
6898160: Need serviceability support for new vm argument type 'uint64_t'
Summary: Add serviceability support for uint64_t. Flags of unknown type assert in debug builds and are ignored in product builds.
Reviewed-by: never, xlu, mchung, dcubed
kamg [Fri, 06 Nov 2009 15:04:26 -0500] rev 4436
Merge
xlu [Fri, 30 Oct 2009 17:24:14 -0700] rev 4435
Merge
phh [Wed, 28 Oct 2009 16:25:51 -0400] rev 4434
6887571: Increase default heap config sizes
Summary: Apply modification of existing server heap size ergo to all collectors except CMS.
Reviewed-by: jmasa, ysr, xlu
cfang [Tue, 10 Nov 2009 17:00:18 -0800] rev 4433
Merge
kvn [Wed, 04 Nov 2009 14:43:50 -0800] rev 4432
6896352: CTW fails hotspot/src/share/vm/opto/escape.cpp:1155
Summary: Always call C->get_alias_index(phase->type(address)) during parsing.
Reviewed-by: never
kvn [Wed, 04 Nov 2009 14:16:20 -0800] rev 4431
6896370: CTW fails share/vm/opto/matcher.cpp:1475 "duplicating node that's already been matched"
Summary: Move DecodeN code outside the memory nodes only code.
Reviewed-by: never
roland [Mon, 02 Nov 2009 11:17:55 +0100] rev 4430
6769124: various 64-bit fixes for c1
Reviewed-by: never
jrose [Fri, 30 Oct 2009 16:22:59 -0700] rev 4429
6858164: invokedynamic code needs some cleanup (post-6655638)
Summary: Fix several crashers, remove needless paths for boxed-style bootstrap method call, refactor & simplify APIs for rewriter constantPoolOop, remove sun.dyn.CallSiteImpl
Reviewed-by: kvn
cfang [Fri, 30 Oct 2009 10:12:52 -0700] rev 4428
6852078: HSX 14/16 in jdk 5.0: api/javax_management api/org_omg jck tests crashes or make tnameserv crash
Summary: Disable SuperWord optimization for unsafe read/write
Reviewed-by: kvn, phh
kvn [Thu, 29 Oct 2009 16:57:55 -0700] rev 4427
6896084: VM does not reserve protected page below heap for compressed oops implicit null checks
Summary: Set narrow_oop_base and narrow_oop_use_implicit_null_checks in Universe::preferred_heap_base().
Reviewed-by: twisti, jcoomes
mikejwre [Thu, 17 Dec 2009 14:10:24 -0800] rev 4426
Added tag jdk7-b78 for changeset c60317f0dfe6
mikejwre [Thu, 17 Dec 2009 14:10:19 -0800] rev 4425
Added tag jdk7-b78 for changeset 2325bc76b570
duke [Wed, 05 Jul 2017 17:04:29 +0200] rev 4424
Added tag jdk7-b78 for changeset 4061c66ba1af
duke [Wed, 05 Jul 2017 17:04:28 +0200] rev 4423
Merge
duke [Wed, 05 Jul 2017 17:04:26 +0200] rev 4422
Merge
mikejwre [Wed, 16 Dec 2009 23:39:39 -0800] rev 4421
Merge
ohair [Wed, 16 Dec 2009 12:52:23 -0800] rev 4420
6909462: Fix nbproject/private references in .hgignore
Summary: See bugzilla issue 100097
Reviewed-by: tbell
Contributed-by: Jesse Glick <jesse.glick@sun.com>
tbell [Tue, 08 Dec 2009 09:16:34 -0800] rev 4419
Merge
jjg [Mon, 07 Dec 2009 14:35:07 -0800] rev 4418
6907660: stupid typo in ZipFileIndex guarantees NPE
Reviewed-by: darcy
darcy [Thu, 03 Dec 2009 14:03:53 -0800] rev 4417
6906748: Project Coin: Minor strings in switch cleanup
Reviewed-by: jjg
tbell [Mon, 23 Nov 2009 19:58:05 -0800] rev 4416
Merge
jjg [Fri, 20 Nov 2009 11:18:43 -0800] rev 4415
6902337: fix langtools build to allow forward refs into jdk/ repo
Reviewed-by: ohair, mcimadamore
jjg [Fri, 20 Nov 2009 10:15:54 -0800] rev 4414
6903456: 6898585 drops javadoc doclet.xml from JDK
Reviewed-by: ohair
jjg [Thu, 19 Nov 2009 11:49:27 -0800] rev 4413
6902720: javac pretty printer does not handle enums correctly
Reviewed-by: mcimadamore
jjg [Thu, 19 Nov 2009 11:43:43 -0800] rev 4412
6900511: javac command line help broken
Reviewed-by: ksrini
jjg [Thu, 19 Nov 2009 11:38:38 -0800] rev 4411
6902264: fix indentation of tableswitch and lookupswitch
Reviewed-by: ksrini
jjg [Tue, 17 Nov 2009 16:45:19 -0800] rev 4410
6898585: restructure langtools build.xml to facilitate more options for <build-classes> macro
Reviewed-by: ohair
mikejwre [Thu, 03 Dec 2009 12:53:12 -0800] rev 4409
Added tag jdk7-b77 for changeset 2edda439128d
duke [Wed, 05 Jul 2017 17:04:22 +0200] rev 4408
Merge
ohair [Wed, 16 Dec 2009 12:52:04 -0800] rev 4407
6909462: Fix nbproject/private references in .hgignore
Summary: See bugzilla issue 100097
Reviewed-by: tbell
Contributed-by: Jesse Glick <jesse.glick@sun.com>
mikejwre [Thu, 03 Dec 2009 12:52:54 -0800] rev 4406
Added tag jdk7-b77 for changeset 8b1d8a20852f
duke [Wed, 05 Jul 2017 17:04:19 +0200] rev 4405
Merge
ohair [Wed, 16 Dec 2009 12:52:01 -0800] rev 4404
6909462: Fix nbproject/private references in .hgignore
Summary: See bugzilla issue 100097
Reviewed-by: tbell
Contributed-by: Jesse Glick <jesse.glick@sun.com>
mikejwre [Thu, 03 Dec 2009 12:52:54 -0800] rev 4403
Added tag jdk7-b77 for changeset d396d3706e0b
duke [Wed, 05 Jul 2017 17:04:16 +0200] rev 4402
Merge
ohair [Wed, 16 Dec 2009 12:51:41 -0800] rev 4401
6909462: Fix nbproject/private references in .hgignore
Summary: See bugzilla issue 100097
Reviewed-by: tbell
Contributed-by: Jesse Glick <jesse.glick@sun.com>
mikejwre [Thu, 03 Dec 2009 12:52:46 -0800] rev 4400
Added tag jdk7-b77 for changeset a9713976af74
duke [Wed, 05 Jul 2017 17:04:13 +0200] rev 4399
Merge
mikejwre [Wed, 16 Dec 2009 23:39:21 -0800] rev 4398
Merge
ohair [Wed, 16 Dec 2009 12:52:09 -0800] rev 4397
6909462: Fix nbproject/private references in .hgignore
Summary: See bugzilla issue 100097
Reviewed-by: tbell
Contributed-by: Jesse Glick <jesse.glick@sun.com>
lana [Wed, 16 Dec 2009 00:09:57 -0800] rev 4396
Merge
lana [Thu, 10 Dec 2009 09:50:09 -0800] rev 4395
Merge
peterz [Thu, 10 Dec 2009 12:08:58 +0300] rev 4394
6827653: Make Synth UI classes public
Reviewed-by: alexp
malenkov [Wed, 09 Dec 2009 11:38:30 +0300] rev 4393
6905574: DOC: Introspector's javadoc contains wrong statement
Reviewed-by: gsm
malenkov [Wed, 09 Dec 2009 11:34:18 +0300] rev 4392
4638075: DOC: Doc for java.beans.PropertyDescriptor.getPropertyType() is incorrect.
Reviewed-by: gsm
malenkov [Mon, 30 Nov 2009 18:30:50 +0300] rev 4391
6905516: Test failed: java/beans/EventHandler/Test6788531.java
Reviewed-by: peterz
malenkov [Mon, 30 Nov 2009 18:26:52 +0300] rev 4390
6905515: Test failed: java/beans/XMLEncoder/6329581/Test6329581.java
Reviewed-by: peterz
amenkov [Fri, 27 Nov 2009 18:38:21 +0300] rev 4389
Merge
amenkov [Fri, 27 Nov 2009 18:36:51 +0300] rev 4388
Merge
amenkov [Fri, 27 Nov 2009 17:54:45 +0300] rev 4387
6832063: OpenJDK fails to open the default ALSA device when PulseAudio is enabled
Reviewed-by: amenkov
Contributed-by: omajid@redhat.com
kalli [Fri, 27 Nov 2009 17:36:34 +0300] rev 4386
6823449: Gervill: ArrayIndexOutOfBoundsException thrown when trying to play too may voices at same time
Reviewed-by: amenkov
kalli [Fri, 27 Nov 2009 17:13:02 +0300] rev 4385
6833357: Improve time-stamp support in Gervill to reduce jitter
Reviewed-by: amenkov
amenkov [Fri, 06 Nov 2009 19:48:56 +0300] rev 4384
6887318: Incorrect constant used in DirectSound Mixer implementation
Reviewed-by: uta
amenkov [Fri, 06 Nov 2009 19:47:32 +0300] rev 4383
6744801: JCK api/javax_sound/interactive/RecordSoundTest.html#RecordSoundTest fails on Solaris10 x64 for -d64
Reviewed-by: dav
malenkov [Fri, 27 Nov 2009 15:24:43 +0300] rev 4382
5102804: Memory leak in Introspector.getBeanInfo(Class) for custom BeanInfo: Class param
Reviewed-by: peterz
okutsu [Fri, 27 Nov 2009 16:20:36 +0900] rev 4381
6904997: (tz) Windows-only: tzmappings needs update for KB976098
Reviewed-by: peytoia
lana [Wed, 25 Nov 2009 14:37:03 -0800] rev 4380
Merge
peterz [Wed, 25 Nov 2009 20:47:20 +0300] rev 4379
6888156: With GTK Look and Feel Icons cannot be rendered in Jtable Cells
Reviewed-by: rupashka
rupashka [Mon, 23 Nov 2009 20:57:17 +0300] rev 4378
6823603: Generics: JList
Reviewed-by: peterz, alexp
Contributed-by: fbrunnerlist@gmx.ch
lana [Thu, 10 Dec 2009 09:46:13 -0800] rev 4377
Merge
dav [Wed, 09 Dec 2009 14:33:55 +0300] rev 4376
6903893: Fix failed for CR 6834576: RemoveChild/ test fail with deadlock on rhel and sles
Reviewed-by: dcherepanov, art
anthony [Wed, 09 Dec 2009 14:02:48 +0300] rev 4375
6900622: Security warning icon is not getting displayed properly for tooltip
Summary: Pass a correct value for the hWndInsertAfter argument to the ::SetWindowPos() function
Reviewed-by: art, dcherepanov
mchung [Tue, 08 Dec 2009 09:02:09 -0800] rev 4374
6907568: java/awt/KeyboardFocusManager.java inproperly merged and lost a changeset
Summary: Reapply fix for 6879044 in java.awt.KeyboardFocusManager
Reviewed-by: dcherepanov, asaha
ant [Mon, 07 Dec 2009 16:38:44 +0300] rev 4373
6903890: SWT_AWT focus issues when a dialog is shown/disposed, on X11
Reviewed-by: art, dcherepanov
dcherepanov [Mon, 07 Dec 2009 14:07:05 +0300] rev 4372
Merge
dcherepanov [Mon, 07 Dec 2009 13:43:04 +0300] rev 4371
6823138: Need to replace ComponentAccessor with AWTAccessor
Reviewed-by: art, anthony
yan [Mon, 07 Dec 2009 13:32:50 +0300] rev 4370
5099725: AWT doesn't seem to handle MappingNotify events under X11.
5036807: Pressing action keys "STOP/AGAIN/COMPOSE" generates keycode of F11/F12 keys.
4787377: VK_STOP key on Solaris generates wrong Key Code
Summary: Added an event processing lumped with similar native code for similar bugs.
Reviewed-by: art
ant [Fri, 04 Dec 2009 15:07:15 +0300] rev 4369
6903354: deadlock involving Component.show & SunToolkit.getImageFromHash
Reviewed-by: art, bae
ant [Wed, 02 Dec 2009 17:26:23 +0300] rev 4368
6566375: PIT : test/java/awt/KeyboardFocusmanager/TypeAhead/TestDialogTypeAhead.html
Reviewed-by: art, dcherepanov
anthony [Wed, 02 Dec 2009 14:51:39 +0300] rev 4367
6901021: Security Warning Icon not getting displayed properly when frame loses focus
Summary: Make sure the gray icon is selected when hiding the security warning
Reviewed-by: art, dcherepanov
anthony [Fri, 27 Nov 2009 16:07:32 +0300] rev 4366
6402325: Swing toolbars vs native toolbars on Windows
Summary: Introduce support for different window types: NORMAL, UTILITY, POPUP
Reviewed-by: art, dcherepanov
art [Fri, 27 Nov 2009 15:26:07 +0300] rev 4365
4913324: Deadlock when using two event queues
Reviewed-by: anthony, ant, dcherepanov
lana [Wed, 25 Nov 2009 22:14:30 -0800] rev 4364
Merge
denis [Wed, 25 Nov 2009 21:27:06 +0300] rev 4363
4899516: Transferable has no DataFlavors when dragging from Gnome window to Swing
Reviewed-by: uta, dav
Contributed-by: Damjan Jovanovic <damjan.jov@gmail.com>
denis [Tue, 24 Nov 2009 18:46:17 +0300] rev 4362
5098433: REG: DnD of File-List between JVM is broken for non ASCII file names - Win32
Reviewed-by: uta, dav
anthony [Fri, 20 Nov 2009 19:11:47 +0300] rev 4361
6863566: Java should support the freedesktop.org startup notification specification
Summary: The startup notification gets removed as soon as a Java top-level window is shown
Reviewed-by: anthony, art, dcherepanov
Contributed-by: Damjan Jovanovic <damjan.jov@gmail.com>
lana [Thu, 10 Dec 2009 09:43:48 -0800] rev 4360
Merge