merge of e24156fa5aa230f0a3328a27650970263b3b3c9f
authorCliff Brake <cbrake@bec-systems.com>
Sat, 8 Jul 2006 20:42:48 +0000 (20:42 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 8 Jul 2006 20:42:48 +0000 (20:42 +0000)
commit5ab456509872fb6f1873c6ba2ee63a3a4cbdb064
tree266df32bef4ea47bd360bc84577bb1a0a8a017de
parent72b3e6442ec3b3bf057555cc11e5a7cf92d195e0
parent56ae402eb68539aeb6fb7604c83f5d2e351752c5
merge of e24156fa5aa230f0a3328a27650970263b3b3c9f
     and fba35ad4edfa08175ea02d3d52147bbcf9f3cfd8