merge of '2cede492dcacf2a0da5e0cdd419d41a41086b31d'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 7 Oct 2007 10:07:50 +0000 (10:07 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 7 Oct 2007 10:07:50 +0000 (10:07 +0000)
commitc880b9ad173871c9458c4847ee512891098ca026
treec7dfd9521f9564a34beea72945b5c3975cc68b1b
parent43436103bd687524182d0cdee741f5b996c378d9
parent98c12c1fc2107ca47aa72634a9b6ca47f818b7b8
Merge ... '2cede492dcacf2a0da5e0cdd419d41a41086b31d'
     and 'caed22d9772a0d7a62f8adfe699c9a254859aae1'