merge of '2548d57472d4c6e09288476a5edccea5b34409d1'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 21 Oct 2007 13:32:03 +0000 (13:32 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 21 Oct 2007 13:32:03 +0000 (13:32 +0000)
     and '775b589cf130e8f819ffd10ac936338120bb8071'


Trivial merge