merge of '19cba47403d3f84e9f053863d3371ac3af470966'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 25 Jul 2008 07:27:16 +0000 (07:27 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 25 Jul 2008 07:27:16 +0000 (07:27 +0000)
commit79730b88fe5c5966beac2cd348080b57b9cf192f
tree89706ca25c1904f3e9020b6e1c01d0140f3ac371
parent555bbd92b49fa2629935cff1e5c43619eee4250b
parenta337446140ce3512e719b377f0c0dfaa01ba1ac8
Merge ... '19cba47403d3f84e9f053863d3371ac3af470966'
     and 'b8fa5480d2b2cfdbca87e0a6795f2eec374b08b4'