merge of '413b439777e0e1e5b8d6289c19d33e8f4f43dd22'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 5 Mar 2007 18:46:40 +0000 (18:46 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 5 Mar 2007 18:46:40 +0000 (18:46 +0000)
commit9aac2e01775a6144fe57109216c6514ec339aa91
tree6e865c0fdafc69619d8be00ce279484ee26ba89c
parent185035435274560fa0d3a418952b51592d39d285
parent60ef6782f7cc9058d4ddc48e06f2b5ad23ce73fa
Merge ... '413b439777e0e1e5b8d6289c19d33e8f4f43dd22'
     and 'e2dbb52fe39df7ef786b6068f6178f29508dfded'