merge of '0b31bda390691b7d9e15f77a2ea3e3705bbf2f12'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 13 Apr 2007 07:11:09 +0000 (07:11 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 13 Apr 2007 07:11:09 +0000 (07:11 +0000)
     and '5bcded2dc238545b2379f23a18eda0fc75732a6b'


Trivial merge