merge of '452dd174691484101b95e30de9d1f28ba4615bcc'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Sat, 6 Oct 2007 19:08:12 +0000 (19:08 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Sat, 6 Oct 2007 19:08:12 +0000 (19:08 +0000)
     and 'e889f1ed6baf92f0a741781bad0574109afad57e'


Trivial merge