merge of b387bb17fbe66898242adaa29f44ed4c12eaea1e
authorJustin Patrin <papercrane@gmail.com>
Sat, 15 Apr 2006 03:50:10 +0000 (03:50 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 15 Apr 2006 03:50:10 +0000 (03:50 +0000)
commit7c0807ddc5e8f0e65da7b1a88692e788fcfb2516
tree3e031a5c1ddf28a130179da3e02ffe748bf0dbc6
parentb1c4f9d640fefdb8442d7608840232d0bbea057d
parent66c4894730379eb318aace935f0ed96c0a69bb1e
merge of b387bb17fbe66898242adaa29f44ed4c12eaea1e
     and ccbffbb600e43462f6435f1404be257286d4909d