merge of '2ae6ecf2677fa2b9a53f45b824b830304af50db8'
authorPaul Sokolovsky <pmiscml@gmail.com>
Tue, 17 Oct 2006 18:34:33 +0000 (18:34 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Tue, 17 Oct 2006 18:34:33 +0000 (18:34 +0000)
commitaff4a3790f564f9da8348fe785b3e3b222f0cbef
tree7b57626437c6682edbc9877cc59fbc07eff19e04
parent811be5135e2486a4b45c4491540abf137b284dce
parentdabb152c4a2af97620abf527ef79c8f8b591420a
Merge ... '2ae6ecf2677fa2b9a53f45b824b830304af50db8'
     and 'ef1738131018813b36ed568f7299f38f6f22f3a2'
conf/machine/htcuniversal.conf