Merge branch 'release-0.6.5'
authorFerry Huberts <ferry.huberts@pelagic.nl>
Thu, 28 Feb 2013 16:42:51 +0000 (17:42 +0100)
committerFerry Huberts <ferry.huberts@pelagic.nl>
Thu, 28 Feb 2013 16:42:51 +0000 (17:42 +0100)
commit322823aafd99b848aa32dda48c085602e65d70f5
tree865fe0bd6b52965e22d0e2c5af1c9ee5f6dca2c0
parentcb15dc18ef4b78828d96432f5daf99c0321c49de
parent6dc0f3745383ecca8a1fd89211fdef31f5196c83
Merge branch 'release-0.6.5'

* release-0.6.5:
  gateway: work around kernel IPIP module initialisation bug
  pud: better detection of java jdk
  pud: detect the java include directory

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>