merge of '1ac2e0e784cd41f10bc1873b42ca201381b538e4'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 1 Sep 2008 09:27:41 +0000 (09:27 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 1 Sep 2008 09:27:41 +0000 (09:27 +0000)
commit9ede41ef1e0e03712e110052dc7ec6fa6d1b81f1
treeecff55b98442309bc3d9b1c3099db35d183c86d3
parent7692f82c912460ed855bfda75f061844306df0aa
parentbee3911fb913536746e67ecefd31194745e49247
Merge ... '1ac2e0e784cd41f10bc1873b42ca201381b538e4'
     and '72a3a26c741dda13cbbf305c4d6a9abad735fd85'