merge of '14bb769ab1e989b6a9aa7d4ae16b3217e857be88'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 22 Feb 2007 17:07:53 +0000 (17:07 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 22 Feb 2007 17:07:53 +0000 (17:07 +0000)
commit665a8b5194daedf83cb0416f76eeb17315bee297
tree4f2bb6416c2a912b25560f2d905d4ef09843e166
parentba13effd8716620e9cf836f2b92389c236b78742
parentdc3d882572ed32a33d61e9baf6a39dfd09c12f71
Merge ... '14bb769ab1e989b6a9aa7d4ae16b3217e857be88'
     and '826367bbd68c19eb406efdb0f5a9c5276fbf3ca8'