merge of '93cd24c7fe5b0752c90fe9cc0ccbb8f1b492f27e'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 22 Mar 2007 09:41:42 +0000 (09:41 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 22 Mar 2007 09:41:42 +0000 (09:41 +0000)
     and 'd4bd4e64e6b804b22b4fd3e003e70d73158f898e'


Trivial merge