Merge branch 'master' into lxc_devel
authorMarco Yuen <marcoy@gmail.com>
Thu, 15 Dec 2011 16:28:05 +0000 (11:28 -0500)
committerMarco Yuen <marcoy@gmail.com>
Thu, 15 Dec 2011 16:28:05 +0000 (11:28 -0500)
commitced3e87fd21b74d9a660fbac56141ba69501ba75
tree51553bb51e78e8a15c711efebe2df983787e7132
parent2308cc32be0f7eaba0328bbd5e1af89b0bd941ce
parent6a4eb97a0643e824012af1e50d4891039de7faf5
Merge branch 'master' into lxc_devel
NodeManager.spec