merge of '0e55c1c0e1e6a5361923fc36b9af9f761d3f5b54'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 15 Jan 2008 23:29:01 +0000 (23:29 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 15 Jan 2008 23:29:01 +0000 (23:29 +0000)
commit28d3a1b9105a55a85cba506747147b0fae9b85c5
tree01a4ff79d8c5eaea4059803626e77e72e062b204
parenta8f9d90d600ff2e6cff2099a45fcb244471b7dd2
parent0b07e526611dc0e1867caa3eb6e4372855488026
Merge ... '0e55c1c0e1e6a5361923fc36b9af9f761d3f5b54'
     and 'c0856cf5b6ece74a7274429e466e6b5c3672ab1d'