merge of '190a360174ecac0e3cc66fd24f7cfb203033cfd3'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 30 Dec 2007 18:53:15 +0000 (18:53 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 30 Dec 2007 18:53:15 +0000 (18:53 +0000)
     and 'b86387e484a9b94c2752d8ce5dcfb79742677efc'


Trivial merge