merge of '5bba276288eaa8fa9d57001cdafb8cb332fcb78b'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 14 Nov 2007 18:49:01 +0000 (18:49 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 14 Nov 2007 18:49:01 +0000 (18:49 +0000)
     and '94fb88049d8aea8313c398d3df50af2d4646f619'


Trivial merge