merge of '03a19fcf3032ced8b3ff0f64a5777d254080a9f1'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 13 Dec 2007 13:30:00 +0000 (13:30 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 13 Dec 2007 13:30:00 +0000 (13:30 +0000)
commitdd74b47934e7f4d3543c6987619da86f60e454b3
treec47133700af6e0220251622986fc0c7b2440f63f
parent8e34e63fa7dc47b94892503677dff3ddc188ffca
parent8fc8bc3b10da16da6174e42c15d4377757a2b923
Merge ... '03a19fcf3032ced8b3ff0f64a5777d254080a9f1'
     and '49d28932b8c420c0aebcd31ae9c387517ea1c6c0'