Merged proto package

[olafBuddenhagen at gmx.net]

Hi,

On Tue, Apr 06, 2010 at 06:43:22PM -0700, Keith Packard wrote:

> This isn't a git super-module,

Well, why not?

-antrik-