merge of '0186939e5675c48f3e8ee1c853bd816dcc4a15a8'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 21 Oct 2007 12:44:06 +0000 (12:44 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 21 Oct 2007 12:44:06 +0000 (12:44 +0000)
commit56c5a3bcfec4cb9d4a70dea5a381da4a04cb8b18
tree8761bf540f453698d7e330446ba01acd6e766389
parent127038060f442ed845a61453b67713e3a37d01a2
parent07364c0adb0e7656c1243b6c4c3f8690ef040351
Merge ... '0186939e5675c48f3e8ee1c853bd816dcc4a15a8'
     and '8c39fbcad580dce7b65af91c3db4a99f9d0ba40b'