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)
     and 'aa3097d17325c17ff5fe04479d9a3a47ec96d299'


Trivial merge