merge of '319280398495ebc3c5efd6dbe0432b3f0edf75a8'
authorOvidiu Sas <sip.nslu@gmail.com>
Tue, 12 Feb 2008 03:06:09 +0000 (03:06 +0000)
committerOvidiu Sas <sip.nslu@gmail.com>
Tue, 12 Feb 2008 03:06:09 +0000 (03:06 +0000)
     and '677d619754f055f535400445a2db685a66b7ad40'


Trivial merge