--- a/src/common/packet.cc	Mon Feb 01 08:09:11 2010 +0100
+++ b/src/common/packet.cc	Mon Feb 01 08:28:11 2010 +0100
@@ -350,14 +350,7 @@
 uint32_t 
 Packet::CopyData (uint8_t *buffer, uint32_t size) const
 {
-  Buffer::Iterator i = m_buffer.Begin ();
-  uint32_t cur = 0;
-  while (!i.IsEnd () && cur < size)
-    {
-      buffer[cur] = i.ReadU8 ();
-      cur++;
-    }
-  return cur;
+  return m_buffer.CopyData (buffer, size);
 }
 
 void