merge of 'e6df832022f99df44b509dc0c3fd63bb19595085'
authorOvidiu Sas <sip.nslu@gmail.com>
Wed, 16 Jan 2008 15:34:18 +0000 (15:34 +0000)
committerOvidiu Sas <sip.nslu@gmail.com>
Wed, 16 Jan 2008 15:34:18 +0000 (15:34 +0000)
commit81256a93a0e9bfe7f43bbf1febfddd16e0912ce9
treef4bf057570aa3e02a0c428f1d77b733a5225e346
parent37fac272ce1ccbdb94ecafb2864d90626e256b7b
parentf0ee954dd96ad99345d8ac116a9fecf92920a9ae
Merge ... 'e6df832022f99df44b509dc0c3fd63bb19595085'
     and 'fc51ba6c6f78e661b51a328e391e78d3fa49d2d0'