merge of 61486dc9a1b23e7088c746a1a9d6c6199cc8f5a5
authorRod Whitby <rod@whitby.id.au>
Sun, 8 Jan 2006 00:45:28 +0000 (00:45 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 8 Jan 2006 00:45:28 +0000 (00:45 +0000)
commit01be40e07087d4fe7fdcf26f952a0ef5f97ca03e
tree7d4eda8d916842a750e0c77e89e9e7f918a4b265
parent7091dd78f0cc114fe3e748276363f09c2dfe820f
parentf2f9caadc01843d18f567cb85d072d1002b7fcb5
merge of 61486dc9a1b23e7088c746a1a9d6c6199cc8f5a5
     and b1dcd027693e6239eac9bebf42988acd618f1125