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)
     and 'fc51ba6c6f78e661b51a328e391e78d3fa49d2d0'


Trivial merge