merge of '1056feb7616863d1ec2a7aeb0cd0f515a02ed7b6'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 31 Jan 2008 13:48:53 +0000 (13:48 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 31 Jan 2008 13:48:53 +0000 (13:48 +0000)
commit8d8e19e9a50bed02e31d76118e7840856290131f
tree2a360e033e8c22af8c6f469bd9528a8664fffd8b
parent77c0e0678373170e7dcc54910b4b2e731c084db3
parent0ad0ddf04866e53b7ae7d32825132af0d3438e68
Merge ... '1056feb7616863d1ec2a7aeb0cd0f515a02ed7b6'
     and '106bb23e9f7ef1f5ea827a00c3a0303c3fe5f8a8'