merge of 42d69359113ca4019c6288abe81bcb0e233a958a
authorRene Wagner <rw@handhelds.org>
Sun, 21 Aug 2005 18:58:34 +0000 (18:58 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 21 Aug 2005 18:58:34 +0000 (18:58 +0000)
     and a4103b0a34e57a4ff4fc7c14b5c95b1456e904f5


Trivial merge