merge of '44f1e05faf7c7b048dbf53c08ede5b091b16a321'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Sat, 6 Jan 2007 08:40:05 +0000 (08:40 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Sat, 6 Jan 2007 08:40:05 +0000 (08:40 +0000)
     and 'c9364961fa6fec14e6bb79b94e98bde8d4881912'


Trivial merge