merge of '93692aaac63b82b355275bee987480a1232079a1'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 1 Jan 2008 13:32:40 +0000 (13:32 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 1 Jan 2008 13:32:40 +0000 (13:32 +0000)
commit0159197c45f5296fbdc29ff180d787e7bb19879d
tree0f6ca220c0818452bc0014fb94c5855cd7c8837d
parent02902173df8534111b016cf47dccb21986986928
parent85814e09364a95bd2abbbb1c918e9c91d715c858
Merge ... '93692aaac63b82b355275bee987480a1232079a1'
     and 'ffd5dadc681850a711352c103d0f1547e77207ca'