merge of '439e88dbf769d76561150772ce1e5a9f63623d35'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Sat, 6 Oct 2007 19:08:00 +0000 (19:08 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Sat, 6 Oct 2007 19:08:00 +0000 (19:08 +0000)
     and 'ac39391bb7e64aa48f58a13b7174c19918cec7d8'


Trivial merge