merge of '7299736bd45f29d862cdc7e7e31153ea62402566'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 6 Dec 2007 17:45:17 +0000 (17:45 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 6 Dec 2007 17:45:17 +0000 (17:45 +0000)
     and 'dec04e494e7ab4322bcd6dc858d4d3689baf8a25'


Trivial merge