Merge remote-tracking branch 'origin/master' into libnl3
authorDan Williams <dcbw@redhat.com>
Sat, 30 Jul 2011 21:48:46 +0000 (16:48 -0500)
committerDan Williams <dcbw@redhat.com>
Sat, 30 Jul 2011 21:48:46 +0000 (16:48 -0500)

Trivial merge