merge of '6f5210038562db01ca0770735bbb801e0fa828e1'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 1 May 2007 10:05:39 +0000 (10:05 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 1 May 2007 10:05:39 +0000 (10:05 +0000)
commit6cdb4b3fa2816832a6d04306320ca9c548fa4c56
tree0e9b00cec0a41233d582dd1d8ace1591ec03e100
parent22429920986429582bd17a531ffe7a84765445b7
parentb398eafcafbed73572eba3d5626e374e41a77ed0
Merge ... '6f5210038562db01ca0770735bbb801e0fa828e1'
     and '81b965980024f9910b33f96029588e606530aae4'