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)
     and '49d28932b8c420c0aebcd31ae9c387517ea1c6c0'


Trivial merge