merge of '8c0eb673de0b4022949225ca080e2dd264461926'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 16 Jan 2007 18:04:08 +0000 (18:04 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 16 Jan 2007 18:04:08 +0000 (18:04 +0000)
     and 'a536e1f1c106f600dacb9b7c677edf69297378fb'


Trivial merge