merge of '53d5f0675c5830e564fb6c225499e149b8d5b836'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 7 Sep 2008 13:37:10 +0000 (13:37 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 7 Sep 2008 13:37:10 +0000 (13:37 +0000)
     and '672d779f4a20adab617645d603796e2df04f86bf'


Trivial merge