Merge commit 'vcato/master'
authorBrian Padalino <bpadalino@gmail.com>
Sun, 28 Jun 2009 14:57:18 +0000 (10:57 -0400)
committerBrian Padalino <bpadalino@gmail.com>
Sun, 28 Jun 2009 14:57:18 +0000 (10:57 -0400)
commit16418c11eda9224b6c412df1a80ff5407963102c
treefdbd0a9bde7eb98c8f91e732ec1584268808dc8c
parent35e831c9767c27c1a4c70dee2b2638066cc57a78
parent6419f7b19856ce46a37159ef2fc5a203a7f1536a
Merge commit 'vcato/master'

Conflicts:
src/novacom.c

Pulling all the changes in together.
src/novacom.c