merge of '4d464c3102b9fdf9ec7f31a9771f62b336967b65'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 25 Feb 2007 12:10:01 +0000 (12:10 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 25 Feb 2007 12:10:01 +0000 (12:10 +0000)
     and 'b8eb30a0fd93f61ff386bac7e2203fb3c883e888'


Trivial merge