merge of 'cb269c669579f2854a506ffe6ac9cb45f2592b25'
authorOvidiu Sas <sip.nslu@gmail.com>
Sun, 13 Jan 2008 16:09:10 +0000 (16:09 +0000)
committerOvidiu Sas <sip.nslu@gmail.com>
Sun, 13 Jan 2008 16:09:10 +0000 (16:09 +0000)
     and 'ed94d35280e9dbc28ff90a5b175dc47c752bf347'


Trivial merge