merge of 5d621370cfba6997b82054d8ebf82dcda659f181
authorRene Wagner <rw@handhelds.org>
Tue, 31 Jan 2006 20:39:42 +0000 (20:39 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 31 Jan 2006 20:39:42 +0000 (20:39 +0000)
commitc9e9b799c3a69b21294cccc5d25a3aa94ae4e321
tree5f860e0bc9c5f954a2d3d1cfe1c7798e2b86cea6
parentf53c6c447742e3a50dc8aaa1632131f2c25e0c4d
parent15b68984f261f62968733e3534bf14aa1e0cf67c
merge of 5d621370cfba6997b82054d8ebf82dcda659f181
     and c1c3a45fe3e2ec0eb7045cf3adb5dd0e4f31bbe2