merge of '6c9b3832ef2260eb1b3a74e74b1d73166ab79d89'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 3 Jun 2008 11:41:30 +0000 (11:41 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 3 Jun 2008 11:41:30 +0000 (11:41 +0000)
commit972f72f4e47196817b8a3fc62a9e9dd188490f81
tree77d115be3d0a03cf9b86de1a70d30330e4d236dc
parentb4db5d7f3e1a0470f2111508e2b701acee95055e
parent915c1e3654c4be1667a9390c3671d1a3601e2a56
Merge ... '6c9b3832ef2260eb1b3a74e74b1d73166ab79d89'
     and 'f275c97e2c93f0e846205b213e997b28ed0b148e'