merge of '4ceb0ef60a086087bfe7a232b07d6fb71c3ccd04'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 22 Aug 2007 17:01:20 +0000 (17:01 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 22 Aug 2007 17:01:20 +0000 (17:01 +0000)
commitfa760cfb01223f333a8553566d845b7a462c459b
tree20c7093841e3bf7445fb2c628a4334bc3ead221a
parente398e9063c713cb73ea3cc19aecc8d9138d6acf9
parent70e5cf9476598fdf441d22adfd166e3ee90ae4c8
Merge ... '4ceb0ef60a086087bfe7a232b07d6fb71c3ccd04'
     and 'eaf6fede3ee9af7cea4d430e426ee09da45e8f21'