merge of '0aec671c9ce897a91bee8ce4cd1731b505b08c94'
authorRichard Purdie <rpurdie@rpsys.net>
Fri, 28 Dec 2007 16:30:46 +0000 (16:30 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Fri, 28 Dec 2007 16:30:46 +0000 (16:30 +0000)
commitfd5705c7b2b033c340e2396d69e7af5c7d1f00a4
treef3024fe38dc776afa39438726db72a546b35e0be
parentd996f889787afbfbc8245f989545aeacd04a98fb
parent872cb9dc7ffd37e5c059efd0e017649fd3551435
Merge ... '0aec671c9ce897a91bee8ce4cd1731b505b08c94'
     and 'efc89b66950503726077461acaa664f7705ed559'