merge of '48f6d095cfa6525db4c539a3ac145ee322be60af'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 18 Jul 2008 15:17:25 +0000 (15:17 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 18 Jul 2008 15:17:25 +0000 (15:17 +0000)
commit66eaf67b6e9eafb9235aef4a40af62a8c07f5daa
tree4bc938e959de38cdb3e4e624a4d784795fc6ef8c
parent55b8e2f2357d7055f171b8affdffb00807ce1497
parent59026446fa41ff202a457da18b3b9db7fe585a11
Merge ... '48f6d095cfa6525db4c539a3ac145ee322be60af'
     and '83a3842e481b7407e271aa8542f64c8eea36f71f'