merge of '820eb34bc4a417691a71d40bf2d2ae059cf1fccd'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 14 Mar 2007 16:33:48 +0000 (16:33 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 14 Mar 2007 16:33:48 +0000 (16:33 +0000)
commit589dd7d9f52a33250a9cbc2076558c5a248513bf
treef8c547c44944ea6db8a4a7f5db7b244c366b3424
parentc7b227a3da9c05a1fd9a6f2f4149794c63fa1e18
parentfeaead134ee6a814b7802cc6a42590cdbdfb4ea5
Merge ... '820eb34bc4a417691a71d40bf2d2ae059cf1fccd'
     and '92449623bd54f49417182496d1ad89e697de0505'