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)
commitc63e9d13cb35a08fe503e53883f75460eacbd040
tree55565fdaac0b72c9154b5c6d89508e8b4c1ef0b7
parentfb8179540d23ef20ad0c1b2095a4775427070958
parent86730fc413832d757ebb1e3d74ca122eba7fdbd4
Merge ... '8bc0e0a5967ae8fccb6d56b0d9f5a3a9bf3d7dff'
     and 'edd46f6b477e2a693c84c2ba999b868f23a733f0'