merge of '7c5dba6a4cc7c7a653ff9454f9d2787304cdc736'
authorRichard Purdie <rpurdie@rpsys.net>
Wed, 15 Nov 2006 10:44:22 +0000 (10:44 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Wed, 15 Nov 2006 10:44:22 +0000 (10:44 +0000)
commit528450f67d00cd3cad700d93cbe88bff666dea84
tree119422052188818eb8da2bcdf3bed73763d1a9ff
parentc01740ed8f1e0ad54311af8677210462df368046
parentcd0d5e6081b0ea60ebfcf0b455a18d56c8c25e32
Merge ... '7c5dba6a4cc7c7a653ff9454f9d2787304cdc736'
     and 'a92b3f38a2b90eca4b4e230c498fbe32f7013525'