merge of '6f0db148d82d30078ed867182e31679b32d6fe62'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 30 Mar 2007 13:27:57 +0000 (13:27 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 30 Mar 2007 13:27:57 +0000 (13:27 +0000)
     and '844f33ecedcd7290081e897e5557e7a5b56b5724'


Trivial merge