Doug MacEachern 4c165819a3 Merge branch 'sigar-1.6' ... Conflicts: bindings/java/hyperic_jni/src/org/hyperic/jni/ArchNameTask.java		2009-06-30 16:08:50 -07:00
..
org/hyperic/jni	Merge branch 'sigar-1.6'	2009-06-30 16:08:50 -07:00