merge of '2b87c80fce42b1cb1d444242944beb67eda5a222'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 8 Jul 2008 13:58:07 +0000 (13:58 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 8 Jul 2008 13:58:07 +0000 (13:58 +0000)
commit0a4f08db9177b19e7ee973c6683bce4e750851c1
tree92bd3dbd402d7fb2b7c7f37b9859d3862bf40d02
parentdff796f98e6148f6fac9cb5b8f7aa0e5a4caac8e
parent04e7918253b3529f6a27eca15bab01b2cd01c998
Merge ... '2b87c80fce42b1cb1d444242944beb67eda5a222'
     and 'bf12ea84196b8d5bca8a71dcd1206b34e2bebcb1'