K 10
svn:author
V 6
marcus
K 8
svn:date
V 27
2011-12-20T00:14:56.000000Z
K 7
svn:log
V 326
Missed some PRs in the 1.6.4 update.

* Clean up Makefile by removing some errant spaces [1]
* Fix up the GnuTLS options [1] [2]
* Add a desktop entry for wireshark [3]

PR:		163146 [1]
		162879 [2]
		163045 [3]
Submitted by:	rm [1]
		Alfred Bartsch <bartsch@dssgmbh.de> [2]
		Olivier Cochard-Labbé <olivier@cochard.me>[3]

END