merge of '1a392ab8017f1647946ea5d52f90a38c2eb55d50'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 16 Sep 2007 13:45:49 +0000 (13:45 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 16 Sep 2007 13:45:49 +0000 (13:45 +0000)
     and '641f6b995e880a8d62279f125ffae431261ad39b'


Trivial merge