merge of '9d4e924b0bb41a7ab01cbbbd984916dc4367895c'
authorRichard Purdie <rpurdie@rpsys.net>
Thu, 27 Dec 2007 16:06:31 +0000 (16:06 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Thu, 27 Dec 2007 16:06:31 +0000 (16:06 +0000)
commit8912d6ca263f76f1b925f2417c1bfafd9a28283d
tree0d415ed9e6563a5604360c5991f70c44be93cb1f
parent969b90880762541f0a33f355b6426cdb1c1037b0
parentb794eccc2e6a33fb1dae9bd0c4becd4de615a2ca
Merge ... '9d4e924b0bb41a7ab01cbbbd984916dc4367895c'
     and 'e2bf9fb2e2837fb9aa6c231fa227d473844d1f88'