merge of '914da41cd2443e235ef11802d112b1bf24220639'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 26 Aug 2007 11:52:32 +0000 (11:52 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 26 Aug 2007 11:52:32 +0000 (11:52 +0000)
commit14cf11eaba74b92abb71672d66f2bbb36584ae1c
tree328edd57496ffec3ff1228dc2c4e61a64c065dcc
parentb646369bb9a646f2c3ef6e2057fca86189a7bb10
parentb12d8562d0e3ee4eed936e2ee15a6be3c54efcbe
Merge ... '914da41cd2443e235ef11802d112b1bf24220639'
     and 'd0274d4f33072ca9b28a7df0196b83a43eab6609'