merge of '917b0d8264255bcc05a47f9b2b7167bf8781ef46'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 30 May 2007 10:17:59 +0000 (10:17 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 30 May 2007 10:17:59 +0000 (10:17 +0000)
     and 'd355cc8d988e0476f885987030dc5cdc1fc2614e'


Trivial merge