merge of '73a23186ee8c84f6b4f8391bda1d41f034358c5c'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 15 May 2008 07:18:53 +0000 (07:18 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 15 May 2008 07:18:53 +0000 (07:18 +0000)
commit1c24e660f2c5dace699e4f0d5606330ee295f5ee
treef8ef2f87ace4b70d26bd3c59657c3e33fd79b24d
parent3e1e2df2910329f09b7d58cd7967f7b1fc2491f8
parentc6a15f8b88644ebfe60d760141fddd94eca36f30
Merge ... '73a23186ee8c84f6b4f8391bda1d41f034358c5c'
     and 'aa3097d17325c17ff5fe04479d9a3a47ec96d299'