merge of 'a87697026a73f10984708224b490659d3ce0d804'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 26 Nov 2007 08:12:34 +0000 (08:12 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 26 Nov 2007 08:12:34 +0000 (08:12 +0000)
commit31c361ab0e1c82f6bae82b3a2392842667dad075
tree2155de4443b4c00816c70c84c56ae3d286bb34e6
parent82ac8f234febee9091a8180d28fc6c260db1ca1f
parent2082789e52e0b43efd6f41cb394514241733e6ec
Merge ... 'a87697026a73f10984708224b490659d3ce0d804'
     and 'e6bf3fbc989603ad89a8d4ca27d7be41e6baa763'