merge of '6bcbba52935837d8cc6bbd2b56f5836157870682'
authorRichard Purdie <rpurdie@rpsys.net>
Sun, 3 Feb 2008 00:16:26 +0000 (00:16 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Sun, 3 Feb 2008 00:16:26 +0000 (00:16 +0000)
commitce5f59bb21cd07436d8b661e1c5205d9d5f1efe6
treef47011673f193c219a9f3d352a5137d3a0ad3d82
parent05d160f70bd8dd3cafdac0d9824c79495be2e6f2
parent01f0994efc30b67cfccc803ddb1fa902d6b2d949
Merge ... '6bcbba52935837d8cc6bbd2b56f5836157870682'
     and 'f83b56f2c6061d5f1487eab87b4530480d6bb88e'