merge of 24f6b65766e0de225c683f9ad48a63ee1a2cf779
authorRod Whitby <rod@whitby.id.au>
Sat, 5 Nov 2005 16:09:03 +0000 (16:09 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 5 Nov 2005 16:09:03 +0000 (16:09 +0000)
     and 680976b94fa3d2c3b2a4dcb5043cfd5e27b05993


Trivial merge