merge of '3fb5d51ceb8343d28129bfcd6d65bd7525eac8d6'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 22 Aug 2006 10:42:09 +0000 (10:42 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 22 Aug 2006 10:42:09 +0000 (10:42 +0000)
     and 'a1d8cff4002cc5f97598844ffb168b6320f0e80f'


Trivial merge