merge of '16e6a3ff4cb1c69984bf7ae782e19b11c3d95e44'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 23 Apr 2008 00:35:34 +0000 (00:35 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 23 Apr 2008 00:35:34 +0000 (00:35 +0000)
commit0bb7eb9614eed4ad395ba3ca90b9a58177fdd878
tree9f3a37c835e1aace40a93c28ab9c42d82e6be08b
parentcaf011037f508f9657495e0ee6f997ee6787937c
parenteca9b17c852a77b8e473d7d2009da5ebea6e47eb
Merge ... '16e6a3ff4cb1c69984bf7ae782e19b11c3d95e44'
     and 'f2d24d867c478e840f017de36fe85bacaa8a0e42'