merge of 'aa908f9edf3bb81b538c3115f62602d8a40d01df'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 19 Dec 2007 13:27:04 +0000 (13:27 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 19 Dec 2007 13:27:04 +0000 (13:27 +0000)
     and 'd99a2eec5529a214f0a05a5ffe3a8697d12c08f0'


Trivial merge