merge of '1056feb7616863d1ec2a7aeb0cd0f515a02ed7b6'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 31 Jan 2008 13:48:53 +0000 (13:48 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 31 Jan 2008 13:48:53 +0000 (13:48 +0000)
     and '106bb23e9f7ef1f5ea827a00c3a0303c3fe5f8a8'


Trivial merge