merge of 'dbc92be1fe4742c442c336c46478ebc072b977ed'
authorRichard Purdie <rpurdie@rpsys.net>
Mon, 28 Jan 2008 17:25:45 +0000 (17:25 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Mon, 28 Jan 2008 17:25:45 +0000 (17:25 +0000)
commitf2568b089f0f035abb391d62fac445e0c11a9a79
tree902f80c9c2ee957d099e619bed00c765b0ba9ed7
parent9054912ea5c0be88da088b92ed33749bc11e3779
parenta1c5c1c76a4f7077b7ebebbc9d663907fe48ff23
Merge ... 'dbc92be1fe4742c442c336c46478ebc072b977ed'
     and 'f37c4d25879e2b68bedfa992671306a142e8181d'