merge of '55e46711dc1a18ac2aab5bf8dd32e86e8a99f02f'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 15 Nov 2007 09:25:51 +0000 (09:25 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 15 Nov 2007 09:25:51 +0000 (09:25 +0000)
commitac1744fe39bd54cf7e36eaabfa037b5c68586e3d
tree059ad869656ae7d55c5d0306f0edba76dcd0a6c4
parent7c4ae4bad58bb7cfb6dbd2d72d7ba6c226c763d0
parent40b6b389533d6b69b51ceebbcd43f24e1f0eb2bd
Merge ... '55e46711dc1a18ac2aab5bf8dd32e86e8a99f02f'
     and '7bd7c5bb615e623e265a40e19243ad0504689f97'