merge of '28e2872ee9420efa1c6785b37d88314496a12175'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 27 Dec 2007 17:27:45 +0000 (17:27 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 27 Dec 2007 17:27:45 +0000 (17:27 +0000)
     and '2c1b6fa0891e86d61e015c51b2b0fc0690789b70'


Trivial merge