merge of 'c46c002524d0be121054c2e92ba2e12db4571442'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 28 May 2008 23:57:48 +0000 (23:57 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 28 May 2008 23:57:48 +0000 (23:57 +0000)
commit02a398b48e62e386ffdfad36af1c21cca34ae475
tree8a61ce50733e427c2fd142951e1d08e705230a9c
parentcf49015dd1cce3d0ec8fcbe2739eec19882eca0a
parent736ab27eb13ebda0f17d2fe7df97c2543a8df5dd
Merge ... 'c46c002524d0be121054c2e92ba2e12db4571442'
     and 'fa394e594a7df67376061a20e296005fc9068aff'