# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: knaak@tgilbert-20100712195803-9yd2lbaxvt38l6jz
# target_branch: bzr+ssh://bazaar.launchpad.net/~mebitek/docky\
#   /cpumonitor/
# testament_sha1: 4ded1b6a80bbc8755029206f0630a2e2848217d2
# timestamp: 2010-07-12 15:58:49 -0400
# base_revision_id: mebitek@marmidha-20100330142249-nf0lzyhwl4boe0fv
# 
# Begin patch
=== modified file 'StandardPlugins/CPUMonitor/src/CPUMonitorDockItem.cs'
--- StandardPlugins/CPUMonitor/src/CPUMonitorDockItem.cs	2010-03-28 11:04:38 +0000
+++ StandardPlugins/CPUMonitor/src/CPUMonitorDockItem.cs	2010-07-12 19:58:03 +0000
@@ -112,6 +112,7 @@
 					long usage = Convert.ToInt64 (collection [(int) ProcFields.Idle].Value) +
 							     Convert.ToInt64 (collection [(int) ProcFields.IRQ].Value) +
 							     Convert.ToInt64 (collection [(int) ProcFields.Nice].Value) +
+								 Convert.ToInt64 (collection [(int) ProcFields.IOWait].Value) +
 							     Convert.ToInt64 (collection [(int) ProcFields.SoftIRQ].Value) +
 							     Convert.ToInt64 (collection [(int) ProcFields.System].Value) +
 							     Convert.ToInt64 (collection [(int) ProcFields.User].Value);

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWd89/qMAAWXfgAQwUGv/91+i
x4q////wUANa7bbk4669ep3hJQgp4QYoehkjMk00PFI0NpPUye1TQGSJpT8TJlNpRtTJk9QAAA0A
ABJEBE09TTRoU9JkNHqaAAZA0A0G1KaaEjynqeGVH6iaaAAAAAABKVDJoyDQYTRoZDIDEAAAGB8M
eF7fXPuM6JrRuAhnshAbfGlMfbVmY+3Yv1GjFZnO0j+fp/XHLL6nL/exPzYiX00GO6ep7vGsFs9W
PZo3asa1ySehy4kVkJ9B71xopvp9MxbhXku3Xo2twm2xyEw5MIeysnW3FKIQ4NSAqMnIMydrrw/C
0SZHM4i7rXR57OZt1zSJz0wo5IM+ZykJTWnK7GR92TDd1ifIiaK0zIIZ6NQ46i1a6sKJVWWJp0p4
IwKEM4mkw9XxWGmJuNRCU+HgFTJpKe8grMmwfXqKyNlcTcEE0WhZmpBGGlK/nXS4l4sFtSw77dYu
tGLQUc6kzITyLQJKSBShUDPLMGgz5AyM2wK3Sy0GD5MVXYqDQYMmrtZcZbaXs1pBhq1ymMLXNRXG
gueV2P+WgjHUPyXfFbTpJGGUCsWkzhi5F002kUCdG9Zz82Za/pc2ekFiRCRMGHGOFlb9TjT5xXcj
iQbIfgZ8D2eWhrQvwcMAd3HZ2NIUr7ssMZ1BieKVN+MmeGCRGCV4r4882648hTjmLoHANDgum0M1
Q9EcIt5brrwy6NWhkK/M3DvbdiY6OpHJfXG0pGjg8ZSvqadLZUlB0O92szhv20fNVqppabtvbpsa
2WQKO7aXyEYQ201twoZoqrnCifKyv2aVwFwsKG1bsbia0zNoHANKrTfsCQwlnoKBKhfEeuPBFhrI
F9U9YKdJ6ZVGoNIRWqVURFJLk+VoBvOCUxtRG0+KjW4K9nQO21FlQzQhYeIQYGgUWigEujwU0TdI
MPI8Bk08IRhxUlongvFaBkc03sgepuptT8tq5Kt68n7BlPJEiAdFblhgq1KxRxSrKIR5JxjQbL+G
A1iYnWbLM383jbF2kSLvnqXGEkAlWDVlgozZk5ojPdLSnXUvZvzUKoy6XUkXdFivl40VA+eUsaCJ
hjwnrtO2DF8cgeir1Vk1EW3R87iZtonjCMO4giwdMLxjuEvvsiL9Z8AEMQK0Kue6HXowLqi/iLC8
KCUj1ih53DzFFx2I3i8/hPxmanVP8XckU4UJDfPf6jA=