merge of '82245638ef37f8730477752665cc0965a7c2556c'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 1 May 2008 00:33:07 +0000 (00:33 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 1 May 2008 00:33:07 +0000 (00:33 +0000)
commita9124b32637a3a1143b7fcc438bfd0ed7e136b28
tree995b222e6dac2bdf9844730da5046759d75ab3c9
parent73c90a2c03b61e5e1fdab8a98d7305ae670829a1
parent1c9196a130c2a4f78e89a871deebb3cd9ac60cc8
Merge ... '82245638ef37f8730477752665cc0965a7c2556c'
     and 'ab470e95662adb7ab2cc12e234b243e2281bde06'