merge of 'a97c08deaa64fb078313a1bd6084b0922666da7a'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 30 Nov 2006 12:08:12 +0000 (12:08 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 30 Nov 2006 12:08:12 +0000 (12:08 +0000)
     and 'aa965681ce3df03a73c3281f983d5fabc6facc40'


Trivial merge