merge of 38a44153ccd68cbefcfc7eb3e945b52f959edfe6
authorRod Whitby <rod@whitby.id.au>
Sat, 13 Aug 2005 17:18:01 +0000 (17:18 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 13 Aug 2005 17:18:01 +0000 (17:18 +0000)
     and a64c34c36a6a5002d454fa4f8693cedf5fce8d73


Trivial merge