merge of '759e78a6743866bb0cd9004d9e947af20218aaf6'
authorOvidiu Sas <sip.nslu@gmail.com>
Wed, 16 Jan 2008 15:37:45 +0000 (15:37 +0000)
committerOvidiu Sas <sip.nslu@gmail.com>
Wed, 16 Jan 2008 15:37:45 +0000 (15:37 +0000)
     and 'c7289c9605cd6d73dd8698f9214422a66461880d'


Trivial merge