merge of '80f7f84f9356a16a8a92b8c33d7297b74324541a'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 7 May 2007 17:41:27 +0000 (17:41 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 7 May 2007 17:41:27 +0000 (17:41 +0000)
commitfb01830e8e9b67757c41c31b547fc7d39ff7778d
tree22d781fca407cc26bf716046addec8ed4d5e61fb
parent32eac857b106e0bcc42c792499917950a2c64d4b
parent6114ba8eaa8d149324204d27d574462f43c52856
Merge ... '80f7f84f9356a16a8a92b8c33d7297b74324541a'
     and 'e4adba489997dfbf5204f63e11aa16515e13e7b2'