merge of '0c08620c82f3631ac19e82f411d1eb63f02fd4f5'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 15 Nov 2007 13:40:41 +0000 (13:40 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 15 Nov 2007 13:40:41 +0000 (13:40 +0000)
commit47f13f72c7e79cfda0e18de7d619ce870d64bca6
tree37ca0891db79f2e618f99443b81711d7a54e6d48
parentda780eb28062d29245169ada804bea913bed9263
parentb1a0540a31e1646ff44fe9ea12e566100866c559
Merge ... '0c08620c82f3631ac19e82f411d1eb63f02fd4f5'
     and 'af497374bb680be4e77a17c0fe994be8572e3004'