merge of '0a649e59614b2140ef8f93c2dc52b1361f2acb0b'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 22 Nov 2007 15:37:15 +0000 (15:37 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 22 Nov 2007 15:37:15 +0000 (15:37 +0000)
     and '0b7b234637a0d41420b6a596ef10e38857ff6f57'


Trivial merge