merge of '101fe5719b8175ae1fd5c8bb133f3310512691c8'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 18 Jan 2007 10:04:29 +0000 (10:04 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 18 Jan 2007 10:04:29 +0000 (10:04 +0000)
commita17cb1fa3c7f5439708a0c09348150e4e9225b9b
tree2cf26d27e1c3a3dc342bb36a6ac25a0dc64e4ddf
parentf61f3efe2389249c001107ccd55dac39e79ef2a1
parent7a9f6bec965daa5ae4c60dadfa5589243df4827e
Merge ... '101fe5719b8175ae1fd5c8bb133f3310512691c8'
     and 'eb0e1154b5abe11697940d2990aa6f0cd6441118'