merge of '131aca0c8651e56bac39f5f02b88e33abc133b07'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 2 Apr 2007 07:48:05 +0000 (07:48 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 2 Apr 2007 07:48:05 +0000 (07:48 +0000)
     and 'f5edc19dd1057109ae156f97cd6387f3a74993fe'


Trivial merge