merge of '1334e5973904d3ffb6bf8fc09ee4ee1f196f89d7'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 10 Mar 2007 14:26:03 +0000 (14:26 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 10 Mar 2007 14:26:03 +0000 (14:26 +0000)
     and '23ad96f5be867b4f297808985a4d7ac90b8f15ea'


Trivial merge