merge of 652c21965b8f4efd9c6793bab6fa53f1364d13e1
authorRene Wagner <rw@handhelds.org>
Tue, 31 Jan 2006 20:38:28 +0000 (20:38 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 31 Jan 2006 20:38:28 +0000 (20:38 +0000)
     and 892ce9ae745dea2c7ecb924566d1bc40ae2abbd5


Trivial merge