merge of '16c96161b634d2e64b9a1b4ba0e3fff5ddf21bcb'
authorOvidiu Sas <sip.nslu@gmail.com>
Wed, 16 Jan 2008 15:29:38 +0000 (15:29 +0000)
committerOvidiu Sas <sip.nslu@gmail.com>
Wed, 16 Jan 2008 15:29:38 +0000 (15:29 +0000)
     and 'c32d254617ffcc037ac8e1b813c7d23979d2cb1c'


Trivial merge