merge of '1146b968b17a4186232fbe41a3a6eb7fe30cc300'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 18 Oct 2007 11:16:50 +0000 (11:16 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 18 Oct 2007 11:16:50 +0000 (11:16 +0000)
     and '40ef55d01967050e97ee3727a1e5e15b968e0a92'


Trivial merge