Viewing all changes in revision 2185.

Committer: Lee Bieber
Date: 2011-02-19 20:47:11 UTC
mfrom: <a title="Merged From 2184.1.2" href="/~drizzle-trunk/drizzle/development/revision/2184.1.2">(2184.1.2 build)
Revision ID: kalebral@gmail.com-20110219204711-qk96sijgwdt03kyq

Merge Marisa - adds logo references to the include file
Merge Monty - some randome clean up stuff

added added

removed removed

~drizzle-trunk/drizzle/development