merge of '6b3553faa17c40c389a2d9c4279cd0a6417358e7'
authorRichard Purdie <rpurdie@rpsys.net>
Mon, 18 Feb 2008 23:17:33 +0000 (23:17 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Mon, 18 Feb 2008 23:17:33 +0000 (23:17 +0000)
commit271bcb3e87c1c1b8236ccbc7d57f225fe60921b4
treed8f2c10a238bc730f730542e7ec307ce99cd6bfc
parent5bbd952b784fb5bd75832eb0ed15ee96c6ae22fd
parent986c64f7c5388bfb3051d5e23985a4f05016418b
Merge ... '6b3553faa17c40c389a2d9c4279cd0a6417358e7'
     and 'faf56bcfb610eaf73ff3c77e1c8c451cde82165d'