merge of '4843e0d9b2f929adb80e40eaaaa3db435a7ff676'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 17 Aug 2007 16:24:06 +0000 (16:24 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 17 Aug 2007 16:24:06 +0000 (16:24 +0000)
     and '6872bbed00f51ddc9c28ab65dae421c4b6751524'


Trivial merge