Rev 5124: (mbp) fix typo (thanks fullermd) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 5124 [merge]
revision-id: pqm at pqm.ubuntu.com-20100330080428-sg126ybh11u7vqpx
parent: pqm at pqm.ubuntu.com-20100330071430-oa8hvye603284qyg
parent: mbp at sourcefrog.net-20100330072956-s9agm9e7ulsgt39z
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2010-03-30 09:04:28 +0100
message:
  (mbp) fix typo (thanks fullermd)
modified:
  doc/developers/HACKING.txt     HACKING-20050805200004-2a5dc975d870f78c
=== modified file 'doc/developers/HACKING.txt'
--- a/doc/developers/HACKING.txt	2010-03-30 03:17:12 +0000
+++ b/doc/developers/HACKING.txt	2010-03-30 07:29:56 +0000
@@ -1039,7 +1039,7 @@
 which unit should be used when. Roughly speaking, IEC standard applies
 for base-2 units and SI standard applies for base-10 units:
 
-* for network bandwidth an disk sizes, use base-10 (Mbits/s, kB/s, GB)
+* for network bandwidth and disk sizes, use base-10 (Mbits/s, kB/s, GB)
 
 * for RAM sizes, use base-2 (GiB, TiB)