Bugs

For bug fixes you should always add the bug no., author and the date to the English comment!
Like:
/* #10, pk, Year.Month.Day, your comment comes here */
E.g. 2007.02.07 for the 23th February 2007
If you encounter a bug you always add a comment in todo.txt and a reproduction scenario. If possible add a junit test. The same is true for a fixed bug, but mark the bug as SOLVED only if all the other junit tests pass too.
Do NOT create a workaround for a bug, where you can do a clean solution. Although small solutions are good solutions. If fixing is not possible today or tomorrow, then let it as it was before!