merge of '0f34f029ae013c8424b0693e3c1017d67649c235'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 8 Jun 2008 03:36:42 +0000 (03:36 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 8 Jun 2008 03:36:42 +0000 (03:36 +0000)
commitd9ff5ca2ac8763e2f428f8a953822b6d7faf98f4
tree9368ccdd2ca18fdc7dad24bbd4a3c93378432833
parent5073b4a0f58c1d703b8798ddadb881345dc2c8fd
parent368098772924fc4010ba3c95a15ccd8aaf4983f2
Merge ... '0f34f029ae013c8424b0693e3c1017d67649c235'
     and '5d3853ec3fe837b91ad1001620a445344aeae8d8'