merge of 'a169800c21f9c42630c25ab09b4da7ca73dac614'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 29 Mar 2007 14:17:01 +0000 (14:17 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 29 Mar 2007 14:17:01 +0000 (14:17 +0000)
     and 'a5a1bb0dfcc9fe8ad8eb18505cdf8ccf37310788'


Trivial merge