merge of '15289d23583c105b389da87ae8365bdb3b6c6452'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 11 Jan 2007 20:11:15 +0000 (20:11 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 11 Jan 2007 20:11:15 +0000 (20:11 +0000)
commit7d4c283e49fec7a86273366a3d55fed53a153d28
treea1e16795504785e34740b43332b9da82f7afda76
parentbb923469dd8964f9d34355d78072e17b7be5f659
parent5945879560ddcab62e91dec5fa58ff786c072bf3
Merge ... '15289d23583c105b389da87ae8365bdb3b6c6452'
     and 'd1600a349f4c63ce3ea4add142fb0b742f6ed341'