--- snmp-graph.properties.orig	2011-03-10 13:39:39.000000000 +0100
+++ snmp-graph.properties	2011-03-10 13:44:47.000000000 +0100
@@ -6544,59 +6544,37 @@
  --upper-limit 100 \
  --lower-limit 0 \
  DEF:cpuinterrupt={rrd1}:CpuRawInterrupt:AVERAGE \
- DEF:minCpuinterrupt={rrd1}:CpuRawInterrupt:MIN \
- DEF:maxCpuinterrupt={rrd1}:CpuRawInterrupt:MAX \
  DEF:cpuuser={rrd2}:CpuRawUser:AVERAGE \
- DEF:minCpuuser={rrd2}:CpuRawUser:MIN \
- DEF:maxCpuuser={rrd2}:CpuRawUser:MAX \
  DEF:cpuwait={rrd3}:CpuRawWait:AVERAGE \
- DEF:minCpuwait={rrd3}:CpuRawWait:MIN \
- DEF:maxCpuwait={rrd3}:CpuRawWait:MAX \
  DEF:cpunice={rrd4}:CpuRawNice:AVERAGE \
- DEF:minCpunice={rrd4}:CpuRawNice:MIN \
- DEF:maxCpunice={rrd4}:CpuRawNice:MAX \
  DEF:cpusystem={rrd5}:CpuRawSystem:AVERAGE \
- DEF:minCpusystem={rrd5}:CpuRawSystem:MIN \
- DEF:maxCpusystem={rrd5}:CpuRawSystem:MAX \
  DEF:cpukernel={rrd6}:CpuRawKernel:AVERAGE \
  DEF:cpuSoftirq={rrd7}:CpuRawSoftIRQ:AVERAGE \
- DEF:minCpuSoftirq={rrd7}:CpuRawSoftIRQ:MIN \
- DEF:maxCpuSoftirq={rrd7}:CpuRawSoftIRQ:MAX \
  CDEF:interrupt=cpuinterrupt \
- CDEF:minInterrupt=minCpuinterrupt \
- CDEF:maxInterrupt=maxCpuinterrupt \
  CDEF:system=cpusystem,interrupt,+,cpuSoftirq,+ \
- CDEF:minSystem=minCpusystem,minInterrupt,+,minCpuSoftirq,+ \
- CDEF:maxSystem=maxCpusystem,maxInterrupt,+,maxCpuSoftirq,+ \
  CDEF:wait=cpuwait,system,+ \
- CDEF:minWait=minCpuwait,minSystem,+ \
- CDEF:maxWait=maxCpuwait,maxSystem,+ \
  CDEF:nice=cpunice,wait,+ \
- CDEF:minNice=minCpunice,minWait,+ \
- CDEF:maxNice=maxCpunice,maxWait,+ \
  CDEF:user=cpuuser,nice,+ \
- CDEF:minUser=minCpuuser,minNice,+ \
- CDEF:maxUser=maxCpuuser,maxNice,+ \
  AREA:user#0000ff:"User      " \
- GPRINT:user:AVERAGE:"  Avg  \\: %8.2lf %s" \
- GPRINT:user:MIN:"Min  \\: %8.2lf %s" \
- GPRINT:user:MAX:"Max  \\: %8.2lf %s\\n" \
+ GPRINT:cpuuser:AVERAGE:"  Avg  \\: %8.2lf %s" \
+ GPRINT:cpuuser:MIN:"Min  \\: %8.2lf %s" \
+ GPRINT:cpuuser:MAX:"Max  \\: %8.2lf %s\\n" \
  AREA:nice#00aa00:"Nice	     " \
- GPRINT:nice:AVERAGE:"  Avg  \\: %8.2lf %s" \
- GPRINT:nice:MIN:"Min  \\: %8.2lf %s" \
- GPRINT:nice:MAX:"Max  \\: %8.2lf %s\\n" \
+ GPRINT:cpunice:AVERAGE:"  Avg  \\: %8.2lf %s" \
+ GPRINT:cpunice:MIN:"Min  \\: %8.2lf %s" \
+ GPRINT:cpunice:MAX:"Max  \\: %8.2lf %s\\n" \
  AREA:wait#ffff00:"Wait      " \
- GPRINT:wait:AVERAGE:"  Avg  \\: %8.2lf %s" \
- GPRINT:wait:MIN:"Min  \\: %8.2lf %s" \
- GPRINT:wait:MAX:"Max  \\: %8.2lf %s\\n" \
+ GPRINT:cpuwait:AVERAGE:"  Avg  \\: %8.2lf %s" \
+ GPRINT:cpuwait:MIN:"Min  \\: %8.2lf %s" \
+ GPRINT:cpuwait:MAX:"Max  \\: %8.2lf %s\\n" \
  AREA:system#00ffff:"System      " \
- GPRINT:system:AVERAGE:"Avg  \\: %8.2lf %s" \
- GPRINT:system:MIN:"Min  \\: %8.2lf %s" \
- GPRINT:system:MAX:"Max  \\: %8.2lf %s\\n" \
+ GPRINT:cpusystem:AVERAGE:"Avg  \\: %8.2lf %s" \
+ GPRINT:cpusystem:MIN:"Min  \\: %8.2lf %s" \
+ GPRINT:cpusystem:MAX:"Max  \\: %8.2lf %s\\n" \
  AREA:interrupt#ff0000:"Interrupts" \
- GPRINT:interrupt:AVERAGE:"  Avg  \\: %8.2lf %s" \
- GPRINT:interrupt:MIN:"Min  \\: %8.2lf %s" \
- GPRINT:interrupt:MAX:"Max  \\: %8.2lf %s\\n"
+ GPRINT:cpuinterrupt:AVERAGE:"  Avg  \\: %8.2lf %s" \
+ GPRINT:cpuinterrupt:MIN:"Min  \\: %8.2lf %s" \
+ GPRINT:cpuinterrupt:MAX:"Max  \\: %8.2lf %s\\n"
 
 report.netsnmp.diskio.bytes.name=Disk IO Bytes
 report.netsnmp.diskio.bytes.columns=diskIONRead,diskIONWritten