merge of '309e33d0dffe90b672817f37e57ed736d1f9672f'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 7 Sep 2008 14:04:59 +0000 (14:04 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 7 Sep 2008 14:04:59 +0000 (14:04 +0000)
commit3aebb066fd5dcdb11f431afecab8be8cfdcea3bf
tree9788062e6545a6cf57d85e9be7678837cb061d49
parent2d478aafe8e20986fe5329cc1ebdbe49461abed1
parenta7ebe54f2c09d521d80f220fa44da5c81ea3f3d5
Merge ... '309e33d0dffe90b672817f37e57ed736d1f9672f'
     and 'efbc6b44ed8a82418c052ce81b199d54d7f6c831'