merge of 426f329c095d506a4beca58b86c1f674c3f3aaff
authorGraeme Gregory <dp@xora.org.uk>
Tue, 4 Apr 2006 12:05:17 +0000 (12:05 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 4 Apr 2006 12:05:17 +0000 (12:05 +0000)
commit77cd8111623f848fdfeb57fc7a9acc30bcd8c72f
tree36d5ae0d2b3cb92ca927f398b9a2f6f8e35330f2
parent60cf6e6971fbb1b44cf41dc3bab39c5424d8661e
parentbe327e49437c5d3c5ac8f3f47f0274975670e434
merge of 426f329c095d506a4beca58b86c1f674c3f3aaff
     and 6881dd1f7588781d1430c0f6307b856be66ee86d