merge of 'b23b7ec5ae17c5427c3d0eb77a11c96d73c53b44'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 12 Jan 2007 23:32:11 +0000 (23:32 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 12 Jan 2007 23:32:11 +0000 (23:32 +0000)
commit41fd59ff07ac6239c33aff33bbb5de02ff4b9b2b
tree6a341776eb4470f4de632883dd31b71eccf96e9c
parent166df77a23b560e238d0e7df4065ff638ad8ea52
parentdc2e799a19a5d57c1ae2bcf8844601245c06b6d0
Merge ... 'b23b7ec5ae17c5427c3d0eb77a11c96d73c53b44'
     and 'ee9553b7958df8396e9de285a3a823f5fe39d8af'