merge of '080fcdca01d44047b988dbb0ff626190537f5cae'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 31 Aug 2008 14:52:09 +0000 (14:52 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 31 Aug 2008 14:52:09 +0000 (14:52 +0000)
     and '22bb42838bf1d7404d344ae172f39130008bc2c7'


Trivial merge