merge of 06f3983d464e263927b50412d18a25426951bf5c
authorJustin Patrin <papercrane@gmail.com>
Wed, 31 Aug 2005 18:28:22 +0000 (18:28 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 31 Aug 2005 18:28:22 +0000 (18:28 +0000)
commitc1dc05985df7c60cfb7ace030286bd8e390975b8
treee15c23254192e6ee16d9908d0f603cd1e9387c10
parentc14bace2d86da524b71fd9a82e33a70a58cea3d1
parentbb02e2d23753db9b37c0874672edb50dceeb32f0
merge of 06f3983d464e263927b50412d18a25426951bf5c
     and 79ddb5aadb42e7555b58cfa11fd3ffd10d698719