merge of 'ace7ee05b32c937d9f796b47ec02fd555802e032'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 4 Nov 2007 14:22:50 +0000 (14:22 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 4 Nov 2007 14:22:50 +0000 (14:22 +0000)
     and 'bea514a9446c6b1f4c44cd730bcb2c6daa5e0f7b'


Trivial merge