merge of '21b14c16cbba51690f09ac5d668340eec0d923ef'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 1 Feb 2008 14:45:50 +0000 (14:45 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 1 Feb 2008 14:45:50 +0000 (14:45 +0000)
commit750bedd21a734b8032998aff4574c79abf547182
treed5c9834bc0a943580a93193d64bb1c1dc56cbdc6
parent7b244a6f48a5bdc5274414f192e196a23aef20c2
parent10f09d94b095294066e05db541669b351a55c245
Merge ... '21b14c16cbba51690f09ac5d668340eec0d923ef'
     and '2295ef5b7a6917972deadcbabf09fec81a977300'