merge of bc6865af3caaa538f4c0db9e72531ab942db996c
authorGraeme Gregory <dp@xora.org.uk>
Tue, 4 Jul 2006 11:25:14 +0000 (11:25 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 4 Jul 2006 11:25:14 +0000 (11:25 +0000)
commitd649adfcaf691303147f0ac30a41ec1f0ba8394b
treed015ef0d7e66e952280c8e00294ad476ac1ca950
parentebfa06218fea7fe7bf0cdd4f64c72cfda914f8e9
parent019ee89e86024935cfff9ba82de135c09cfa2650
merge of bc6865af3caaa538f4c0db9e72531ab942db996c
     and e11d5bc6095b312e2da53fa0044c962ba24663b5