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)
commitf7c13c3a168ab9682f0322b335cb0a3573d82ee4
treeb4a720cfd837a0143f93a47b6e6a371a4c4cff88
parentc37b36b5891360514dc73ee51b3988892feb25c7
parent9fe3b448d22bb457e69d2fa0788f8127966a3ca3
Merge ... '080fcdca01d44047b988dbb0ff626190537f5cae'
     and '22bb42838bf1d7404d344ae172f39130008bc2c7'