merge of '5fa3007028c7a54924741e99045d28fbfcad4be4'
authorOvidiu Sas <sip.nslu@gmail.com>
Wed, 16 Jan 2008 15:33:47 +0000 (15:33 +0000)
committerOvidiu Sas <sip.nslu@gmail.com>
Wed, 16 Jan 2008 15:33:47 +0000 (15:33 +0000)
     and 'b54b6efc8251bc5fce52afcb9a74272f2cea1bbb'


Trivial merge