merge of '0e7d709ae536ea44f5cea432f11a470b4b8508cc'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 7 Oct 2007 17:47:52 +0000 (17:47 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 7 Oct 2007 17:47:52 +0000 (17:47 +0000)
commit209f1c683008652f45d8de04078e53f0b91bd8ee
tree9f42b0ebd8bf7507567bf6c5c01e0ddc5aa9b131
parent096061d2395d5ca861d542c599c18741d79a41c9
parent9156fc13516db49e349c2ce8421484e618f1457d
Merge ... '0e7d709ae536ea44f5cea432f11a470b4b8508cc'
     and '9cc1cd6d050938f685ff391b4065f8961f8304a8'