merge of 1e5d155bb4785e9650d4b05e4bae0c7c8a3ff11f
authorRod Whitby <rod@whitby.id.au>
Thu, 27 Apr 2006 23:24:39 +0000 (23:24 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 27 Apr 2006 23:24:39 +0000 (23:24 +0000)
     and d4fc38fb08cc643983acea4a5d23706a1aa08636


Trivial merge