merge of 0967efd07b22c9bc660b86824d4c3a888f0d9e4a
authorJustin Patrin <papercrane@gmail.com>
Tue, 18 Oct 2005 21:28:46 +0000 (21:28 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 18 Oct 2005 21:28:46 +0000 (21:28 +0000)
commitc59ab5ea95e7f6735db9b7ebbc304be39be7885d
tree8a8f7ac21c32c20492913a6053026e01ff11784d
parentab80eb5f9fe3fa23ec7be291b53b06be2d81d96a
parent7fee3209d5dabcfadafde381d76d6d3585eb8725
merge of 0967efd07b22c9bc660b86824d4c3a888f0d9e4a
     and 7b483e2e04e0fbbaf5a7d86cc57455420540e5fa