merge of '2756e6b25efd4532c1a23fd31f68481d2f8b68a3'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 29 Nov 2007 22:52:57 +0000 (22:52 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 29 Nov 2007 22:52:57 +0000 (22:52 +0000)
     and '9c32fcb38cb012f79311cd1b07560964873c6307'


Trivial merge