merge of '6b3a4b7868d3ebe4f5c8cf504377475025fcaaed'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 7 Jan 2007 13:03:54 +0000 (13:03 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 7 Jan 2007 13:03:54 +0000 (13:03 +0000)
     and 'f66c5a130f53c8844d10944787f479687058e418'


Trivial merge