merge of '8bc0e0a5967ae8fccb6d56b0d9f5a3a9bf3d7dff'
authorOvidiu Sas <sip.nslu@gmail.com>
Sat, 2 Feb 2008 02:05:40 +0000 (02:05 +0000)
committerOvidiu Sas <sip.nslu@gmail.com>
Sat, 2 Feb 2008 02:05:40 +0000 (02:05 +0000)
     and 'edd46f6b477e2a693c84c2ba999b868f23a733f0'


Trivial merge