merge of '355866fda3e7098f7d30f22852c4e3ad5145126b'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 19 Aug 2008 18:06:36 +0000 (18:06 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 19 Aug 2008 18:06:36 +0000 (18:06 +0000)
commitdd3a870ed4f6deed3141c596e2b5520eb9f8fba8
tree01a8ace82e98a01909ffd2036993bdcccbbdd373
parent6760f8efc93922a44d225129143387c37d760f1b
parent171e4483d1c184ea872b53d7c4b8ee2d097a6ac6
Merge ... '355866fda3e7098f7d30f22852c4e3ad5145126b'
     and '5ad8db39f892a4c9b9c381f015e9709e5cd01b4a'