merge of '0413bc22cd84e097b31969ed4179c1b5ff152b99'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 7 Nov 2007 23:55:19 +0000 (23:55 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 7 Nov 2007 23:55:19 +0000 (23:55 +0000)
commitd3cb49ac45579e863bec58325ffc3f2554ec84e8
tree4554fe4a69b843ad0a4fdd8803ae811dad747272
parent804e6e798d8957cc980abc3da1219fc4adebe18b
parentbd734d95a7782fe13dc95d62aa79ca337c813344
Merge ... '0413bc22cd84e097b31969ed4179c1b5ff152b99'
     and 'a8532082ddec43c58d47a8c2ed2b6f0d2ef18651'