Merge branch 'master' of ../mine
authorStephen Hemminger <stephen.hemminger@vyatta.com>
Mon, 1 Nov 2010 18:37:23 +0000 (14:37 -0400)
committerStephen Hemminger <stephen.hemminger@vyatta.com>
Mon, 1 Nov 2010 18:37:23 +0000 (14:37 -0400)

Trivial merge