merge of '2f01f26b2d9b304d4bda8793b0e7cfce2011ad45'
authorRichard Purdie <rpurdie@rpsys.net>
Sun, 6 Jan 2008 19:58:19 +0000 (19:58 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Sun, 6 Jan 2008 19:58:19 +0000 (19:58 +0000)
commite152b2196bee93cbefe5a576d8649cc7388aa435
tree8b113e402e00511636d472ef7e8aedabb6699937
parentd4b854684ee2537edb57ade42cd90248b694432d
parent3742113ef49b7a6cabce2f484f856e34a935df77
Merge ... '2f01f26b2d9b304d4bda8793b0e7cfce2011ad45'
     and '85d4ab967941a2bea382fb9211cd65212be527a6'