merge of '66d9cc1155353a9e1d178f4143dd89f86fc64dcb'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 3 Apr 2008 05:22:30 +0000 (05:22 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 3 Apr 2008 05:22:30 +0000 (05:22 +0000)
     and 'dfcef904001ea652ac525bfc9b2f775f88de1d70'


Trivial merge