merge of 'cc2dee251c099ad31d7d885b6a61f2a647771d53'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 17 Jan 2007 12:01:42 +0000 (12:01 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 17 Jan 2007 12:01:42 +0000 (12:01 +0000)
     and 'd76744543bb9aba107e27bebc49ba78c300eb803'


Trivial merge