merge of '0ab238b94b1334bafe81ee7d6a1453fef174daef'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 18 Feb 2008 16:40:59 +0000 (16:40 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 18 Feb 2008 16:40:59 +0000 (16:40 +0000)
     and '706fd42c80157eab994b346e94eaa415faff2486'


Trivial merge