Merge remote-tracking branch 'kahrl/dissector'
authorPerttu Ahola <celeron55@gmail.com>
Tue, 30 Aug 2011 11:24:33 +0000 (14:24 +0300)
committerPerttu Ahola <celeron55@gmail.com>
Tue, 30 Aug 2011 11:24:33 +0000 (14:24 +0300)

Trivial merge